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

Had to switch include order to solve #typedef conflicts

Browse Source
This commit is contained in:
Hombre
2010-11-06 12:37:57 +01:00
parent 87d1f3ae46
commit 4189521d37
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtengine/imageio.cc
View File

@@ -24,11 +24,6 @@
#include <tiffio.h> #include <tiffio.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
extern "C" {
#include "jdatasrc.c"
#include <jpeglib.h>
#include <iccjpeg.h>
}
#ifdef WIN32 #ifdef WIN32
#include <winsock2.h> #include <winsock2.h>
#else #else
@@ -36,6 +31,11 @@ extern "C" {
#endif #endif
#include <iptcpairs.h> #include <iptcpairs.h>
#include <libiptcdata/iptc-jpeg.h> #include <libiptcdata/iptc-jpeg.h>
extern "C" {
#include "jdatasrc.c"
#include <jpeglib.h>
#include <iccjpeg.h>
}
Glib::ustring safe_locale_to_utf8 (const std::string& src); Glib::ustring safe_locale_to_utf8 (const std::string& src);