liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Major rework of headers inclusion style on behalf of lebedev.ri (issue 1079)

Browse Source
This commit is contained in:
michael
2011-12-17 12:08:57 -05:00
parent d5c07f18b5
commit bf71a01ca5
303 changed files with 1180 additions and 6702 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rtengine/imageio.cc
View File

@@ -19,24 +19,23 @@
*/
#include <png.h>
#include <glib/gstdio.h>
#include <imageio.h>
#include <safegtk.h>
#include "imageio.h"
#include "safegtk.h"
#include <tiff.h>
#include <tiffio.h>
#include <stdio.h>
#include <string.h>
#include <cstdio>
#include <cstring>
#include <fcntl.h>
#ifdef WIN32
#include <winsock2.h>
#else
#include <netinet/in.h>
#endif
#include <iptcpairs.h>
#include "iptcpairs.h"
#include <libiptcdata/iptc-jpeg.h>
extern "C" {
#include <iccjpeg.h>
}
#include "iccjpeg.h"
#include "jpeg.h"
Glib::ustring safe_locale_to_utf8 (const std::string& src);
@@ -365,12 +364,12 @@ int ImageIO::loadJPEG (Glib::ustring fname) {
//jpeg_stdio_src(&cinfo,file);
jpeg_read_header(&cinfo, TRUE);
//if JPEG is CMYK, then abort reading
if (cinfo.jpeg_color_space == JCS_CMYK || cinfo.jpeg_color_space == JCS_YCCK) {
//if JPEG is CMYK, then abort reading
if (cinfo.jpeg_color_space == JCS_CMYK || cinfo.jpeg_color_space == JCS_YCCK) {
jpeg_destroy_decompress(&cinfo);
return IMIO_READERROR;
}
return IMIO_READERROR;
}
unsigned int proflen;
delete loadedProfileData;