[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/extragear/kde3/libs/libkdcraw
From: Gilles Caulier <caulier.gilles () gmail ! com>
Date: 2009-01-11 18:25:02
Message-ID: 1231698302.033496.21017.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 909495 by cgilles:
libkdcraw from KDE3 branch : updated to LibRaw 0.6.7:
* Added support for Samsung S85
* Changes in external jpeg (metadata) processing
M +4 -1 NEWS
M +22 -11 libraw/internal/dcraw_common.cpp
M +2 -2 libraw/internal/defines.h
M +2 -2 libraw/internal/foveon.cpp
M +1 -1 libraw/libraw/libraw_version.h
M +3 -1 libraw/src/libraw_cxx.cpp
--- branches/extragear/kde3/libs/libkdcraw/NEWS #909494:909495
@@ -1,8 +1,11 @@
0.1.8
------------------------------------------------------------------------
Fix PPM color preview extraction.
+Updated to libraw 0.6.7:
+ -Added support for Samsung S85.
+ -Changes in external jpeg (metadata) processing.
Updated to libraw 0.6.6:
- -Changes in Panasonic FZ50 processing code
+ -Changes in Panasonic FZ50 processing code.
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.
--- branches/extragear/kde3/libs/libkdcraw/libraw/internal/dcraw_common.cpp #909494:909495
@@ -1,6 +1,6 @@
/*
GENERATED FILE, DO NOT EDIT
- Generated from dcraw/dcraw.c at Tue Jan 6 15:32:20 2009
+ Generated from dcraw/dcraw.c at Sun Jan 11 10:58:58 2009
Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
for copyright information.
*/
@@ -3698,7 +3698,7 @@
#endif
#undef TS
-void CLASS median_filter ()
+void CLASS median_filter()
{
ushort (*pix)[4];
int pass, c, i, j, k, med[9];
@@ -4662,6 +4662,7 @@
case 50706: /* DNGVersion */
FORC4 dng_version = (dng_version << 8) + fgetc(ifp);
if (!make[0]) strcpy (make, "DNG");
+ is_raw = 1;
break;
case 50710: /* CFAPlaneColor */
if (len > 4) len = 4;
@@ -4942,7 +4943,7 @@
void CLASS parse_external_jpeg()
{
char *file, *ext, *jname, *jfile, *jext;
-#line 5972 "dcraw/dcraw.c"
+#line 5973 "dcraw/dcraw.c"
ext = strrchr (ifname, '.');
file = strrchr (ifname, '/');
if (!file) file = strrchr (ifname, '\\');
@@ -4950,14 +4951,16 @@
file++;
if (!ext || strlen(ext) != 4 || ext-file != 8) return;
jname = (char *) malloc (strlen(ifname) + 1);
- merror (jname, "parse_external()");
+ merror (jname, "parse_external_jpeg()");
strcpy (jname, ifname);
jfile = file - ifname + jname;
jext = ext - ifname + jname;
if (strcasecmp (ext, ".jpg")) {
strcpy (jext, isupper(ext[1]) ? ".JPG":".jpg");
- memcpy (jfile, file+4, 4);
- memcpy (jfile+4, file, 4);
+ if (isdigit(*file)) {
+ memcpy (jfile, file+4, 4);
+ memcpy (jfile+4, file, 4);
+ }
} else
while (isdigit(*--jext)) {
if (*jext != '9') {
@@ -4985,7 +4988,7 @@
#endif
}
free (jname);
-#line 6017 "dcraw/dcraw.c"
+#line 6020 "dcraw/dcraw.c"
}
/*
@@ -5426,7 +5429,7 @@
data_offset = (INT64) get4() + 8;
data_offset += (INT64) get4() << 32;
}
-#line 6562 "dcraw/dcraw.c"
+#line 6565 "dcraw/dcraw.c"
void CLASS adobe_coeff (const char *p_make, const char *p_model)
{
static const struct {
@@ -5987,6 +5990,7 @@
{ 4841984, "PENTAX", "Optio S" ,1 },
{ 6114240, "PENTAX", "Optio S4" ,1 }, /* or S4i, CASIO EX-Z4 */
{ 10702848, "PENTAX", "Optio 750Z" ,1 },
+ { 16098048, "SAMSUNG", "S85" ,1 },
{ 12582980, "Sinar", "" ,0 },
{ 33292868, "Sinar", "" ,0 },
{ 44390468, "Sinar", "" ,0 } };
@@ -6666,6 +6670,13 @@
width = 3072;
load_raw = &CLASS packed_12_load_raw;
load_flags = 7;
+ } else if (!strcmp(model,"S85")) {
+ height = 2448;
+ width = 3264;
+ raw_width = 3288;
+ order = 0x4d4d;
+ load_raw = &CLASS unpacked_load_raw;
+ maximum = 0xfef8;
} else if (!strcmp(model,"STV680 VGA")) {
height = 484;
width = 644;
@@ -7254,7 +7265,7 @@
if (strcmp (input, "embed"))
hInProfile = cmsOpenProfileFromFile (input, "r");
else if (profile_length) {
-#line 8397 "dcraw/dcraw.c"
+#line 8408 "dcraw/dcraw.c"
hInProfile = cmsOpenProfileFromMem (imgdata.color.profile, profile_length);
} else
{
@@ -7404,7 +7415,7 @@
#endif
memset(histogram,0,sizeof(int)*LIBRAW_HISTOGRAM_SIZE*4);
-#line 8549 "dcraw/dcraw.c"
+#line 8560 "dcraw/dcraw.c"
for (img=image[0], row=0; row < height; row++)
for (col=0; col < width; col++, img+=4) {
if (!raw_color) {
@@ -7545,7 +7556,7 @@
}
-#line 8714 "dcraw/dcraw.c"
+#line 8725 "dcraw/dcraw.c"
void CLASS tiff_set (ushort *ntag,
ushort tag, ushort type, int count, int val)
{
--- branches/extragear/kde3/libs/libkdcraw/libraw/internal/defines.h #909494:909495
@@ -1,6 +1,6 @@
/*
GENERATED FILE, DO NOT EDIT
- Generated from dcraw/dcraw.c at Tue Jan 6 15:32:20 2009
+ Generated from dcraw/dcraw.c at Sun Jan 11 10:58:57 2009
Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
for copyright information.
*/
@@ -8,7 +8,7 @@
#line 27 "dcraw/dcraw.c"
#define NO_JPEG
#line 32 "dcraw/dcraw.c"
-#define VERSION "8.89"
+#define VERSION "8.90"
#define _GNU_SOURCE
#define _USE_MATH_DEFINES
--- branches/extragear/kde3/libs/libkdcraw/libraw/internal/foveon.cpp #909494:909495
@@ -1,6 +1,6 @@
/*
GENERATED FILE, DO NOT EDIT
- Generated from dcraw/dcraw.c at Tue Jan 6 15:32:20 2009
+ Generated from dcraw/dcraw.c at Sun Jan 11 10:58:58 2009
Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
for copyright information.
*/
@@ -692,7 +692,7 @@
#undef image
/* RESTRICTED code ends here */
-#line 6460 "dcraw/dcraw.c"
+#line 6463 "dcraw/dcraw.c"
char * CLASS foveon_gets (int offset, char *str, int len)
{
int i;
--- branches/extragear/kde3/libs/libkdcraw/libraw/libraw/libraw_version.h #909494:909495
@@ -26,7 +26,7 @@
#define LIBRAW_MAJOR_VERSION 0
#define LIBRAW_MINOR_VERSION 6
-#define LIBRAW_PATCH_VERSION 6
+#define LIBRAW_PATCH_VERSION 7
#define LIBRAW_VERSION_TAIL Release
#define _LIBRAW_VERSION_MAKE(a,b,c,d) #a"."#b"."#c"-"#d
--- branches/extragear/kde3/libs/libkdcraw/libraw/src/libraw_cxx.cpp #909494:909495
@@ -1259,6 +1259,7 @@
"Olympus SP510UZ",
"Olympus SP550UZ",
"Olympus SP560UZ",
+"Olympus SP570UZ",
"Panasonic DMC-FZ8",
"Panasonic DMC-FZ18",
"Panasonic DMC-FZ28",
@@ -1300,6 +1301,7 @@
"RoverShot 3320af",
"Samsung GX-1S",
"Samsung GX-10",
+"Samsung S85",
"Sarnoff 4096x5440",
"Sigma SD9",
"Sigma SD10",
@@ -1322,7 +1324,7 @@
"Sony DSLR-A900",
"Sony XCD-SX910CR",
"STV680 VGA",
- NULL
+NULL
};
const char** LibRaw::cameraList() { return static_camera_list;}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic