[Digikam-devel] branches/KDE/4.2/kdegraphics/libs/libkdcraw

[Gilles Caulier]

SVN commit 908064 by cgilles:

libkdcraw from KDE 4.2 branch : update internal Libraw to stable 0.6.6
-Changes in Panasonic FZ50 files processing
-binary compatibility respected
CCMAIL: digikam-devel at kde.org


 M  +1 -0      NEWS  
 M  +4 -4      libraw/internal/dcraw_common.cpp  
 M  +1 -1      libraw/internal/defines.h  
 M  +1 -1      libraw/internal/foveon.cpp  
 M  +1 -1      libraw/libraw/libraw_version.h  
 AM            libraw/samples/dcraw_half.c   [License: GPL (v2+) (wrong address)]
 D             libraw/samples/dcraw_half.cpp  
 AM            libraw/samples/half_mt.c   [License: GPL (v2+) (wrong address)]
 D             libraw/samples/half_mt.cpp  
 A             libraw/samples/half_mt_win32.c   [License: GPL (v2+) (wrong address)]
 D             libraw/samples/half_mt_win32.cpp  
 M  +1 -1      test/CMakeLists.txt  


--- branches/KDE/4.2/kdegraphics/libs/libkdcraw/NEWS #908063:908064
@@ -1,5 +1,6 @@
 0.4.0 - Released with KDE 4.2.0
 ------------------------------------------------------------------------
+- Updated to LibRaw 0.6.6 : Changes in Panasonic FZ50 files processing.
 - Updated to LibRaw 0.6.5 : Fixed file descriptor and buffer memory leak when thumbnail extractor is called, 
                             but library object is not properly initialized.
                             Fixes in Imacon files unpacking.
--- branches/KDE/4.2/kdegraphics/libs/libkdcraw/libraw/internal/dcraw_common.cpp #908063:908064
@@ -1,6 +1,6 @@
 /* 
    GENERATED FILE, DO NOT EDIT
-   Generated from dcraw/dcraw.c at Sun Jan  4 16:41:18 2009
+   Generated from dcraw/dcraw.c at Tue Jan  6 15:32:20 2009
    Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
    for copyright information.
 */
@@ -6861,14 +6861,14 @@
 	zero_is_bad = 1;
 	adobe_coeff ("Panasonic","DMC-FZ18");  break;
       case 3690:
-	height += 36;
+	height -= 2;
 	left_margin = -14;
-	filters = 0x49494949;
 	maximum = 0xf7f0;
       case 3770:
 	width = 3672;
-	if ((height -= 39) == 2760)
+	if (--height == 2798 && (height = 2760))
 	  top_margin = 15;
+	else filters = 0x49494949;
 	left_margin += 17;
 	zero_is_bad = 1;
 	adobe_coeff ("Panasonic","DMC-FZ50");  break;
--- branches/KDE/4.2/kdegraphics/libs/libkdcraw/libraw/internal/defines.h #908063:908064
@@ -1,6 +1,6 @@
 /* 
    GENERATED FILE, DO NOT EDIT
-   Generated from dcraw/dcraw.c at Sun Jan  4 16:41:18 2009
+   Generated from dcraw/dcraw.c at Tue Jan  6 15:32:20 2009
    Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
    for copyright information.
 */
--- branches/KDE/4.2/kdegraphics/libs/libkdcraw/libraw/internal/foveon.cpp #908063:908064
@@ -1,6 +1,6 @@
 /* 
    GENERATED FILE, DO NOT EDIT
-   Generated from dcraw/dcraw.c at Sun Jan  4 16:41:18 2009
+   Generated from dcraw/dcraw.c at Tue Jan  6 15:32:20 2009
    Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
    for copyright information.
 */
--- branches/KDE/4.2/kdegraphics/libs/libkdcraw/libraw/libraw/libraw_version.h #908063:908064
@@ -26,7 +26,7 @@
 
 #define LIBRAW_MAJOR_VERSION  0
 #define LIBRAW_MINOR_VERSION  6
-#define LIBRAW_PATCH_VERSION  5
+#define LIBRAW_PATCH_VERSION  6
 #define LIBRAW_VERSION_TAIL   Release
 
 #define _LIBRAW_VERSION_MAKE(a,b,c,d) #a"."#b"."#c"-"#d
** branches/KDE/4.2/kdegraphics/libs/libkdcraw/libraw/samples/dcraw_half.c #property svn:eol-style
   + native
** branches/KDE/4.2/kdegraphics/libs/libkdcraw/libraw/samples/half_mt.c #property svn:eol-style
   + native
--- branches/KDE/4.2/kdegraphics/libs/libkdcraw/test/CMakeLists.txt #908063:908064
@@ -36,9 +36,9 @@
 LIBKDCRAW_BUILD_TEST(simple_dcraw)
 LIBKDCRAW_BUILD_TEST(mem_image)
 LIBKDCRAW_BUILD_TEST(dcraw_emu)
-LIBKDCRAW_BUILD_TEST(dcraw_half)
 #IF(WIN32)
 #    LIBKDCRAW_BUILD_TEST(half_mt_win32)
 #ELSE(WIN32)
 #    LIBKDCRAW_BUILD_TEST(half_mt)
+#    LIBKDCRAW_BUILD_TEST(dcraw_half)
 #ENDIF(WIN32)