[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-03-22 20:58:06
Message-ID: 1237755486.518473.10803.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 942896 by cgilles:
update interanal LibRaw to 0.7.1
M +2 -0 NEWS
M +2 -15 libraw/internal/dcraw_common.cpp
M +1 -5 libraw/internal/dcraw_fileio.cpp
M +1 -6 libraw/internal/defines.h
M +1 -6 libraw/internal/foveon.cpp
M +1 -1 libraw/libraw/libraw_version.h
--- branches/extragear/kde3/libs/libkdcraw/NEWS #942895:942896
@@ -1,5 +1,7 @@
0.1.9
------------------------------------------------------------------------
+Updated to LibRaw 0.7.1 :
+ - Fixed broken OpenMP support.
Updated to LibRaw 0.7.0 :
- Black (masked) pixels data extracted from RAW and avaliable in application.
- Application can turn off RAW data filtering (black level subtraction,
--- branches/extragear/kde3/libs/libkdcraw/libraw/internal/dcraw_common.cpp \
#942895:942896 @@ -1,11 +1,10 @@
/*
GENERATED FILE, DO NOT EDIT
- Generated from dcraw/dcraw.c at Sun Mar 15 13:33:55 2009
+ Generated from dcraw/dcraw.c at Sun Mar 22 20:07:52 2009
Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
for copyright information.
*/
-#line 260 "dcraw/dcraw.c"
#define CLASS LibRaw::
#include "libraw/libraw_types.h"
#define LIBRAW_LIBRARY_BUILD
@@ -14,7 +13,6 @@
#include "internal/defines.h"
#include "internal/var_defines.h"
-#line 270 "dcraw/dcraw.c"
#ifndef __GLIBC__
char *my_memmem (char *haystack, size_t haystacklen,
@@ -29,7 +27,6 @@
#define memmem my_memmem
#endif
-#line 304 "dcraw/dcraw.c"
ushort CLASS sget2 (uchar *s)
{
@@ -104,7 +101,6 @@
if ((order == 0x4949) == (ntohs(0x1234) == 0x1234))
swab ((char*)pixel, (char*)pixel, count*2);
}
-#line 381 "dcraw/dcraw.c"
void CLASS canon_black (double dark[2])
{
int c, diff, row, col;
@@ -639,7 +635,6 @@
canon_black (dark);
}
-#line 927 "dcraw/dcraw.c"
int CLASS ljpeg_start (struct jhead *jh, int info_only)
{
int c, tag, len;
@@ -1264,7 +1259,6 @@
free (pixel);
#endif
}
-#line 1556 "dcraw/dcraw.c"
void CLASS ppm_thumb (FILE *tfp)
{
char *thumb;
@@ -1762,7 +1756,6 @@
}
}
-#line 2057 "dcraw/dcraw.c"
void CLASS sinar_4shot_load_raw()
{
ushort *pixel;
@@ -2990,7 +2983,6 @@
smal_decode_segment (seg+i, holes);
if (holes) fill_holes (holes);
}
-#line 4158 "dcraw/dcraw.c"
void CLASS pseudoinverse (double (*in)[3], double (*out)[3], int size)
{
@@ -3254,7 +3246,7 @@
temp = fimg + size*3;
if ((nc = colors) == 3 && filters) nc++;
#ifdef LIBRAW_LIBRARY_BUILD
-#pragma omp parallel default(shared) private(i,col,row,thold,lev,lpass,hpass,temp) \
firstprivate(c,scale,size) */ +#pragma omp parallel default(shared) \
private(i,col,row,thold,lev,lpass,hpass,temp) firstprivate(c,scale,size) #endif
{
temp = (float*)malloc( (iheight + iwidth) * sizeof *fimg);
@@ -4258,7 +4250,6 @@
}
}
-#line 5429 "dcraw/dcraw.c"
void CLASS parse_makernote (int base, int uptag)
{
static const uchar xlat[2][256] = {
@@ -4790,7 +4781,6 @@
}
}
-#line 5964 "dcraw/dcraw.c"
int CLASS parse_tiff_ifd (int base)
{
unsigned entries, tag, type, len, plen=16, save;
@@ -5952,7 +5942,6 @@
data_offset = (INT64) get4() + 8;
data_offset += (INT64) get4() << 32;
}
-#line 7229 "dcraw/dcraw.c"
#ifdef LIBRAW_LIBRARY_BUILD
void CLASS adobe_coeff (const char *p_make, const char *p_model)
#else
@@ -7855,7 +7844,6 @@
RUN_CALLBACK(LIBRAW_PROGRESS_IDENTIFY,1,2);
#endif
}
-#line 9223 "dcraw/dcraw.c"
void CLASS convert_to_rgb()
{
int row, col, c, i, j, k;
@@ -8111,7 +8099,6 @@
}
-#line 9503 "dcraw/dcraw.c"
void CLASS tiff_set (ushort *ntag,
ushort tag, ushort type, int count, int val)
{
--- branches/extragear/kde3/libs/libkdcraw/libraw/internal/dcraw_fileio.cpp \
#942895:942896 @@ -1,18 +1,16 @@
/*
GENERATED FILE, DO NOT EDIT
- Generated from dcraw/dcraw.c at Sun Mar 15 13:33:57 2009
+ Generated from dcraw/dcraw.c at Sun Mar 22 20:08:03 2009
Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
for copyright information.
*/
-#line 4007 "dcraw/dcraw.c"
#define CLASS LibRaw::
#include "libraw/libraw_types.h"
#define LIBRAW_LIBRARY_BUILD
#include "libraw/libraw.h"
#include "internal/defines.h"
#include "internal/var_defines.h"
-#line 4017 "dcraw/dcraw.c"
/*
Seach from the current directory up to the root looking for
@@ -30,7 +28,6 @@
#endif
if (fname)
fp = fopen (fname, "r");
-#line 4060 "dcraw/dcraw.c"
if (!fp)
{
#ifdef LIBRAW_LIBRARY_BUILD
@@ -126,7 +123,6 @@
RUN_CALLBACK(LIBRAW_PROGRESS_DARK_FRAME,1,2);
#endif
}
-#line 9134 "dcraw/dcraw.c"
#ifndef NO_LCMS
void CLASS apply_profile (char *input, char *output)
--- branches/extragear/kde3/libs/libkdcraw/libraw/internal/defines.h #942895:942896
@@ -1,13 +1,11 @@
/*
GENERATED FILE, DO NOT EDIT
- Generated from dcraw/dcraw.c at Sun Mar 15 13:33:55 2009
+ Generated from dcraw/dcraw.c at Sun Mar 22 20:07:52 2009
Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
for copyright information.
*/
-#line 28 "dcraw/dcraw.c"
#define NO_JPEG
-#line 33 "dcraw/dcraw.c"
#define VERSION "8.93"
#define _GNU_SOURCE
@@ -43,7 +41,6 @@
#else
#define _(String) (String)
#endif
-#line 76 "dcraw/dcraw.c"
#ifdef __CYGWIN__
#include <io.h>
#endif
@@ -72,7 +69,6 @@
#ifndef LONG_BIT
#define LONG_BIT (8 * sizeof (long))
#endif
-#line 170 "dcraw/dcraw.c"
#define FORC(cnt) for (c=0; c < cnt; c++)
#define FORC3 FORC(3)
#define FORC4 FORC(4)
@@ -126,7 +122,6 @@
3 G R G R G R 3 B G B G B G 3 R G R G R G 3 G B G B G B
*/
-#line 228 "dcraw/dcraw.c"
#define BAYER(row,col) \
image[((row) >> shrink)*iwidth + ((col) >> shrink)][FC(row,col)]
--- branches/extragear/kde3/libs/libkdcraw/libraw/internal/foveon.cpp #942895:942896
@@ -1,11 +1,10 @@
/*
GENERATED FILE, DO NOT EDIT
- Generated from dcraw/dcraw.c at Sun Mar 15 13:33:56 2009
+ Generated from dcraw/dcraw.c at Sun Mar 22 20:07:52 2009
Look into original file (probably http://cybercom.net/~dcoffin/dcraw/dcraw.c)
for copyright information.
*/
-#line 3286 "dcraw/dcraw.c"
#define CLASS LibRaw::
#include "libraw/libraw_types.h"
#define LIBRAW_IO_REDEFINED
@@ -17,7 +16,6 @@
#define SRC_USES_CURVE
#include "internal/var_defines.h"
#define sget4(s) sget4((uchar *)s)
-#line 3299 "dcraw/dcraw.c"
/* RESTRICTED code starts here */
@@ -277,12 +275,10 @@
return i < 0 ? -curve[1-i] : curve[1+i];
}
-#line 3561 "dcraw/dcraw.c"
#ifdef image
#undef image
#endif
#define image ((short(*)[4]) imgdata.image)
-#line 3568 "dcraw/dcraw.c"
void CLASS foveon_interpolate()
{
@@ -719,7 +715,6 @@
#undef image
/* RESTRICTED code ends here */
-#line 7128 "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 \
#942895:942896 @@ -26,7 +26,7 @@
#define LIBRAW_MAJOR_VERSION 0
#define LIBRAW_MINOR_VERSION 7
-#define LIBRAW_PATCH_VERSION 0
+#define LIBRAW_PATCH_VERSION 1
#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