[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: 2008-12-11 21:32:45
Message-ID: 1229031165.154925.884.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 895854 by cgilles:
updated to LibRaw 0.6.3
M +3 -3 NEWS
M +25 -20 libraw/internal/dcraw_common.cpp
M +1 -1 libraw/internal/defines.h
M +7 -7 libraw/internal/foveon.cpp
M +1 -1 libraw/libraw/libraw_version.h
--- branches/extragear/kde3/libs/libkdcraw/NEWS #895853:895854
@@ -1,15 +1,15 @@
0.1.7
------------------------------------------------------------------------
-Updated LibRaw to 0.6.2.
+Updated to LibRaw to 0.6.3 : NEF processing code changed (some overflow control added).
+Updated to LibRaw to 0.6.2.
New cameras: Canon G10 & 5D Mk2, Leaf AFi 7, Leica D-LUX4,
Panasonic FX150 & G 1, Fujifilm IS Pro.
0.1.6
------------------------------------------------------------------------
-Updated LibRaw to 0.6.1.
+Updated to LibRaw to 0.6.1.
Ported to LibRaw 0.6.0 Api. Removed dcraw.c and DcrawBinary class.
New cameras: Canon 50D, Sony A900, Nikon D90 & P6000, Panasonic LX3 FZ28.
-
0.1.5
------------------------------------------------------------------------
--- branches/extragear/kde3/libs/libkdcraw/libraw/internal/dcraw_common.cpp #895853:895854
@@ -1,6 +1,6 @@
/*
GENERATED FILE, DO NOT EDIT
- Generated from dcraw/dcraw.c at Thu Dec 4 18:30:08 2008
+ Generated from dcraw/dcraw.c at Thu Dec 11 18:24:22 2008
Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
for copyright information.
*/
@@ -913,7 +913,7 @@
7,6,8,5,9,4,10,3,11,12,2,0,1,13,14 } };
struct decode *dindex;
ushort ver0, ver1, vpred[2][2], hpred[2], csize;
- int i, max, step=0, huff=0, split=0, row, col, len, shl, diff;
+ int i, min, max, step=0, huff=0, split=0, row, col, len, shl, diff;
fseek (ifp, meta_offset, SEEK_SET);
ver0 = fgetc(ifp);
@@ -939,14 +939,16 @@
{
read_shorts (curve, max=csize);
color_flags.curve_state = LIBRAW_COLORSTATE_LOADED; }
+ while (curve[max-2] == curve[max-1]) max--;
init_decoder();
make_decoder (nikon_tree[huff], 0);
fseek (ifp, data_offset, SEEK_SET);
getbits(-1);
- for (row=0; row < height; row++) {
+ for (min=row=0; row < height; row++) {
if (split && row == split) {
init_decoder();
make_decoder (nikon_tree[huff+1], 0);
+ max += (min = 16) << 1;
}
for (col=0; col < raw_width; col++) {
for (dindex=first_decode; dindex->branch[0]; )
@@ -958,9 +960,9 @@
diff -= (1 << len) - !shl;
if (col < 2) hpred[col] = vpred[row & 1][col] += diff;
else hpred[col & 1] += diff;
- if (hpred[col & 1] >= max) derror();
+ if ((ushort)(hpred[col & 1] + min) >= max) derror();
if ((unsigned) (col-left_margin) < width)
- BAYER(row,col-left_margin) = curve[hpred[col & 1] & 0x3fff];
+ BAYER(row,col-left_margin) = curve[LIM((short)hpred[col & 1],0,0x3fff)];
}
}
}
@@ -1101,7 +1103,7 @@
}
free (pixel);
}
-#line 1395 "dcraw/dcraw.c"
+#line 1397 "dcraw/dcraw.c"
void CLASS ppm_thumb (FILE *tfp)
{
char *thumb;
@@ -1509,7 +1511,7 @@
}
}
-#line 1806 "dcraw/dcraw.c"
+#line 1808 "dcraw/dcraw.c"
void CLASS sinar_4shot_load_raw()
{
ushort *pixel;
@@ -2056,7 +2058,7 @@
#endif
jpeg_destroy_decompress (&cinfo);
throw LIBRAW_EXCEPTION_DECODE_JPEG;
-#line 2355 "dcraw/dcraw.c"
+#line 2357 "dcraw/dcraw.c"
}
buf = (*cinfo.mem->alloc_sarray)
((j_common_ptr) &cinfo, JPOOL_IMAGE, width*3, 1);
@@ -2564,7 +2566,7 @@
smal_decode_segment (seg+i, holes);
if (holes) fill_holes (holes);
}
-#line 3560 "dcraw/dcraw.c"
+#line 3562 "dcraw/dcraw.c"
/*
Seach from the current directory up to the root looking for
@@ -2580,7 +2582,7 @@
RUN_CALLBACK(LIBRAW_PROGRESS_BAD_PIXELS,0,2);
if (fname)
fp = fopen (fname, "r");
-#line 3601 "dcraw/dcraw.c"
+#line 3603 "dcraw/dcraw.c"
if (!fp)
{
imgdata.process_warnings |= LIBRAW_WARN_NO_BADPIXELMAP;
@@ -3871,7 +3873,7 @@
}
}
-#line 4895 "dcraw/dcraw.c"
+#line 4897 "dcraw/dcraw.c"
void CLASS parse_makernote (int base, int uptag)
{
static const uchar xlat[2][256] = {
@@ -4126,7 +4128,9 @@
cam_mul[2] = get2() / 256.0;
color_flags.cam_mul_state = LIBRAW_COLORSTATE_LOADED;
}
- if (tag == 0x2010 && type == 13)
+ if ((tag | 0x70) == 0x2070 && type == 4)
+ fseek (ifp, get4()+base, SEEK_SET);
+ if (tag == 0x2010 && type != 7)
load_raw = &CLASS olympus_e410_load_raw;
if (tag == 0x2020)
parse_thumb_note (base, 257, 258);
@@ -4355,7 +4359,7 @@
}
}
-#line 5382 "dcraw/dcraw.c"
+#line 5386 "dcraw/dcraw.c"
int CLASS parse_tiff_ifd (int base)
{
unsigned entries, tag, type, len, plen=16, save;
@@ -4654,6 +4658,7 @@
break;
case 50706: /* DNGVersion */
FORC4 dng_version = (dng_version << 8) + fgetc(ifp);
+ if (!make[0]) strcpy (make, "DNG");
break;
case 50710: /* CFAPlaneColor */
if (len > 4) len = 4;
@@ -4934,7 +4939,7 @@
void CLASS parse_external_jpeg()
{
char *file, *ext, *jname, *jfile, *jext;
-#line 5964 "dcraw/dcraw.c"
+#line 5969 "dcraw/dcraw.c"
ext = strrchr (ifname, '.');
file = strrchr (ifname, '/');
if (!file) file = strrchr (ifname, '\\');
@@ -4977,7 +4982,7 @@
#endif
}
free (jname);
-#line 6009 "dcraw/dcraw.c"
+#line 6014 "dcraw/dcraw.c"
}
/*
@@ -5197,7 +5202,7 @@
fseek (ifp, base, SEEK_SET);
order = get4() & 0xffff;
if (get4() >> 8 != 0x526177) return; /* "Raw" */
- fseek (ifp, base+get4(), SEEK_SET);
+ fseek (ifp, get4()+base, SEEK_SET);
entries = get4();
get4();
while (entries--) {
@@ -5418,7 +5423,7 @@
data_offset = (INT64) get4() + 8;
data_offset += (INT64) get4() << 32;
}
-#line 6554 "dcraw/dcraw.c"
+#line 6559 "dcraw/dcraw.c"
void CLASS adobe_coeff (const char *p_make, const char *p_model)
{
static const struct {
@@ -7246,7 +7251,7 @@
if (strcmp (input, "embed"))
hInProfile = cmsOpenProfileFromFile (input, "r");
else if (profile_length) {
-#line 8389 "dcraw/dcraw.c"
+#line 8394 "dcraw/dcraw.c"
hInProfile = cmsOpenProfileFromMem (imgdata.color.profile, profile_length);
} else
{
@@ -7396,7 +7401,7 @@
#endif
memset(histogram,0,sizeof(int)*LIBRAW_HISTOGRAM_SIZE*4);
-#line 8541 "dcraw/dcraw.c"
+#line 8546 "dcraw/dcraw.c"
for (img=image[0], row=0; row < height; row++)
for (col=0; col < width; col++, img+=4) {
if (!raw_color) {
@@ -7537,7 +7542,7 @@
}
-#line 8706 "dcraw/dcraw.c"
+#line 8711 "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 #895853:895854
@@ -1,6 +1,6 @@
/*
GENERATED FILE, DO NOT EDIT
- Generated from dcraw/dcraw.c at Thu Dec 4 18:30:08 2008
+ Generated from dcraw/dcraw.c at Thu Dec 11 18:24:22 2008
Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
for copyright information.
*/
--- branches/extragear/kde3/libs/libkdcraw/libraw/internal/foveon.cpp #895853:895854
@@ -1,11 +1,11 @@
/*
GENERATED FILE, DO NOT EDIT
- Generated from dcraw/dcraw.c at Thu Dec 4 18:30:08 2008
+ Generated from dcraw/dcraw.c at Thu Dec 11 18:24:22 2008
Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
for copyright information.
*/
-#line 2864 "dcraw/dcraw.c"
+#line 2866 "dcraw/dcraw.c"
#define CLASS LibRaw::
#include "libraw/libraw_types.h"
#define LIBRAW_LIBRARY_BUILD
@@ -16,7 +16,7 @@
#define SRC_USES_CURVE
#include "internal/var_defines.h"
#define sget4(s) sget4((uchar *)s)
-#line 2876 "dcraw/dcraw.c"
+#line 2878 "dcraw/dcraw.c"
/* RESTRICTED code starts here */
@@ -38,7 +38,7 @@
cur = free_decode++;
if (free_decode > first_decode+2048) {
throw LIBRAW_EXCEPTION_DECODE_RAW;
-#line 2901 "dcraw/dcraw.c"
+#line 2903 "dcraw/dcraw.c"
}
if (code)
for (i=0; i < size; i++)
@@ -270,12 +270,12 @@
return i < 0 ? -curve[1-i] : curve[1+i];
}
-#line 3135 "dcraw/dcraw.c"
+#line 3137 "dcraw/dcraw.c"
#ifdef image
#undef image
#endif
#define image ((short(*)[4]) imgdata.image)
-#line 3142 "dcraw/dcraw.c"
+#line 3144 "dcraw/dcraw.c"
void CLASS foveon_interpolate()
{
@@ -692,7 +692,7 @@
#undef image
/* RESTRICTED code ends here */
-#line 6452 "dcraw/dcraw.c"
+#line 6457 "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 #895853:895854
@@ -26,7 +26,7 @@
#define LIBRAW_MAJOR_VERSION 0
#define LIBRAW_MINOR_VERSION 6
-#define LIBRAW_PATCH_VERSION 2
+#define LIBRAW_PATCH_VERSION 3
#define LIBRAW_VERSION_TAIL Release
#define _LIBRAW_VERSION_MAKE(a,b,c,d) #a"."#b"."#c"-"#d
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic