Update of /cvsroot/ufraw/ufraw
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10102
Modified Files:
iccjpeg.c iccjpeg.h
Log Message:
Copy iccjpeg.[ch] from lcms-2.4.
Index: iccjpeg.c
===================================================================
RCS file: /cvsroot/ufraw/ufraw/iccjpeg.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- iccjpeg.c 1 Jan 2013 04:00:16 -0000 1.9
+++ iccjpeg.c 1 Jan 2013 04:30:06 -0000 1.10
@@ -15,7 +15,14 @@
* with ICC profiles exceeding 64K bytes in size. If you need to do that,
* change all the "unsigned int" variables to "INT32". You'll also need
* to find a malloc() replacement that can allocate more than 64K.
+ *
+ * UFRaw: Copied from lcms-2.4 January 2013.
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_LIBJPEG
#include "iccjpeg.h"
#include <stdlib.h> /* define malloc() */
@@ -246,3 +253,5 @@
return TRUE;
}
+
+#endif /* HAVE_LIBJPEG */
Index: iccjpeg.h
===================================================================
RCS file: /cvsroot/ufraw/ufraw/iccjpeg.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- iccjpeg.h 1 Jan 2013 04:00:17 -0000 1.4
+++ iccjpeg.h 1 Jan 2013 04:30:06 -0000 1.5
@@ -14,10 +14,12 @@
* NOTE: this code would need surgery to work on 16-bit-int machines
* with ICC profiles exceeding 64K bytes in size. See iccprofile.c
* for details.
+ *
+ * UFRaw: Copied from lcms-2.4 January 2013.
*/
#include <stdio.h> /* needed to define "FILE", "NULL" */
-#include "jpeglib.h"
+#include <jpeglib.h>
/*
------------------------------------------------------------------------------
Master SQL Server Development, Administration, T-SQL, SSAS, SSIS, SSRS
and more. Get SQL Server skills now (including 2012) with LearnDevNow -
200+ hours of step-by-step video tutorials by Microsoft MVPs and experts.
SALE $99.99 this month only - learn more at:
http://p.sf.net/sfu/learnmore_122512
_______________________________________________
ufraw-cvs mailing list
ufraw-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ufraw-cvs
