Hello community, here is the log from the commit of package dcraw for openSUSE:Factory checked in at 2012-08-04 09:09:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dcraw (Old) and /work/SRC/openSUSE:Factory/.dcraw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dcraw", Maintainer is "postadal@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/dcraw/dcraw.changes 2012-06-28 15:18:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dcraw.new/dcraw.changes 2012-08-04 09:10:59.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Jul 30 20:44:51 UTC 2012 - asterios.dramis@gmail.com + +- Update to version 9.16: + dcraw - revision 1.452 + * Measured saturation level on the Canon EOS-1D X. + * Support the Samsung NX1000 and Sony RX100. + * Support the Canon EOS 650D, Samsung NX20, and Sigma SD1. + +------------------------------------------------------------------- Old: ---- dcraw-9.15.tar.gz New: ---- dcraw-9.16.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dcraw.spec ++++++ --- /var/tmp/diff_new_pack.9CSmmO/_old 2012-08-04 09:11:01.000000000 +0200 +++ /var/tmp/diff_new_pack.9CSmmO/_new 2012-08-04 09:11:01.000000000 +0200 @@ -17,7 +17,7 @@ Name: dcraw -Version: 9.15 +Version: 9.16 Release: 0 Summary: Raw Digital Photo Decoding License: GPL-2.0+ ++++++ README ++++++ --- /var/tmp/diff_new_pack.9CSmmO/_old 2012-08-04 09:11:02.000000000 +0200 +++ /var/tmp/diff_new_pack.9CSmmO/_new 2012-08-04 09:11:02.000000000 +0200 @@ -77,7 +77,7 @@ execute permission. * [18]dcraw.c -- decodes raw photos, extracts thumbnails, and displays metadata - Supports 466 cameras at last count. Compile with "gcc -o dcraw -O4 + Supports 474 cameras at last count. Compile with "gcc -o dcraw -O4 dcraw.c -lm -ljasper -ljpeg -llcms" or "gcc -o dcraw -O4 dcraw.c -lm -DNODEPS". Run with no arguments to see a usage message. Don't complain that 16-bit output is too dark -- read the [19]FAQ! @@ -460,6 +460,7 @@ * Canon EOS 500D / Digital Rebel T1i / Kiss Digital X3 * Canon EOS 550D / Digital Rebel T2i / Kiss Digital X4 * Canon EOS 600D / Digital Rebel T3i / Kiss Digital X5 + * Canon EOS 650D / Digital Rebel T4i / Kiss Digital X6i * Canon EOS 1000D / Digital Rebel XS / Kiss Digital F * Canon EOS 1100D / Digital Rebel T3 / Kiss Digital X50 * Canon EOS D2000C @@ -605,6 +606,7 @@ * Leica D-LUX5 * Leica V-LUX1 * Leica V-LUX2 + * Leica V-LUX3 * Logitech Fotoman Pixtura * Mamiya ZD * Micron 2010 @@ -655,6 +657,7 @@ * Nikon D5100 * Nikon D7000 * Nikon D800 + * Nikon D800E * Nikon 1 J1 * Nikon 1 V1 * Nikon E700 ("DIAG RAW" hack) @@ -792,7 +795,9 @@ * Samsung NX10 * Samsung NX11 * Samsung NX100 + * Samsung NX20 * Samsung NX200 + * Samsung NX1000 * Samsung WB550 * Samsung WB2000 * Samsung S85 (hacked) @@ -802,6 +807,8 @@ * Sigma SD10 * Sigma SD14 * Sigma SD15 + * Sigma SD1 + * Sigma SD1 Merill * Sigma DP1 * Sigma DP1S * Sigma DP1X @@ -817,6 +824,7 @@ * SMaL Ultra-Pocket 5 * Sony DSC-F828 * Sony DSC-R1 + * Sony DSC-RX100 * Sony DSC-V3 * Sony DSLR-A100 * Sony DSLR-A200 ++++++ dcraw-9.15.tar.gz -> dcraw-9.16.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw.c new/dcraw/dcraw.c --- old/dcraw/dcraw.c 2012-06-26 04:45:07.000000000 +0200 +++ new/dcraw/dcraw.c 2012-07-05 06:40:56.000000000 +0200 @@ -19,11 +19,11 @@ *If you have not modified dcraw.c in any way, a link to my homepage qualifies as "full source code". - $Revision: 1.449 $ - $Date: 2012/06/26 02:43:41 $ + $Revision: 1.451 $ + $Date: 2012/07/05 04:33:11 $ */ -#define DCRAW_VERSION "9.15" +#define DCRAW_VERSION "9.16" #ifndef _GNU_SOURCE #define _GNU_SOURCE @@ -2777,7 +2777,7 @@ void CLASS foveon_dp_load_raw() { unsigned c, roff[4], row, col, diff; - ushort huff[258], vpred, hpred; + ushort huff[258], vpred[2][2], hpred[2]; fseek (ifp, 8, SEEK_CUR); foveon_huff (huff); @@ -2786,13 +2786,13 @@ FORC3 { fseek (ifp, data_offset+roff[c], SEEK_SET); getbits(-1); - vpred = 1024; + vpred[0][0] = vpred[0][1] = vpred[1][0] = vpred[1][1] = 512; for (row=0; row < height; row++) { for (col=0; col < width; col++) { diff = ljpeg_diff(huff); - if (col) hpred += diff; - else hpred = vpred += diff; - image[row*width+col][c] = hpred; + if (col < 2) hpred[col] = vpred[row & 1][col] += diff; + else hpred[col & 1] += diff; + image[row*width+col][c] = hpred[col & 1]; } } } @@ -6335,6 +6335,8 @@ { 6941,-1164,-857,-3825,11597,2534,-416,1540,6039 } }, { "Canon EOS 600D", 0, 0x3510, { 6461,-907,-882,-4300,12184,2378,-819,1944,5931 } }, + { "Canon EOS 650D", 0, 0x354d, + { 6602,-841,-939,-4472,12458,2247,-975,2039,6148 } }, { "Canon EOS 1000D", 0, 0xe43, { 6771,-1139,-977,-7818,15123,2928,-1244,1437,7533 } }, { "Canon EOS 1100D", 0, 0x3510, @@ -6895,6 +6897,8 @@ { 8898,-2498,-994,-3144,11328,2066,-760,1381,4576 } }, { "SAMSUNG NX2", 0, 0xfff, /* NX20, NX200, NX210 */ { 6933,-2268,-753,-4921,13387,1647,-803,1641,6096 } }, + { "SAMSUNG NX1000", 0, 0, + { 6933,-2268,-753,-4921,13387,1647,-803,1641,6096 } }, { "SAMSUNG NX", 0, 0, /* NX5, NX10, NX11, NX100 */ { 10332,-3234,-1168,-6111,14639,1520,-1352,2647,8331 } }, { "SAMSUNG WB2000", 0, 0xfff, @@ -6911,6 +6915,8 @@ { 8512,-2641,-694,-8042,15670,2526,-1821,2117,7414 } }, { "SONY DSC-V3", 0, 0, { 7511,-2571,-692,-7894,15088,3060,-948,1111,8128 } }, + { "SONY DSC-RX100", 192, 0, /* DJC */ + { 7329,-2746,-405,-2691,9338,3354,-136,1259,5051 } }, { "SONY DSLR-A100", 0, 0xfeb, { 9437,-2811,-774,-8405,16215,2290,-710,596,7181 } }, { "SONY DSLR-A290", 0, 0, @@ -6966,7 +6972,7 @@ { "SONY SLT-A65", 128, 0, { 5491,-1192,-363,-4951,12342,2948,-911,1722,7192 } }, { "SONY SLT-A77", 128, 0, - { 5491,-1192,-363,-4951,12342,2948,-911,1722,7192 } } + { 5491,-1192,-363,-4951,12342,2948,-911,1722,7192 } }, }; double cam_xyz[4][3]; char name[130]; @@ -7728,6 +7734,12 @@ height -= top_margin = 45; left_margin = 142; width = 4916; + } else if (is_canon && raw_width == 5280) { + top_margin = 52; + left_margin = 72; + if (unique_id == 0x80000301) + adobe_coeff ("Canon","EOS 650D"); + goto canon_cr2; } else if (is_canon && raw_width == 5344) { top_margin = 51; left_margin = 142; @@ -8032,11 +8044,11 @@ raw_width = fsize/height/2; order = 0x4d4d; load_raw = &CLASS unpacked_load_raw; - } else if (!strncmp(model,"NX1",3)) { + } else if (!strcmp(make,"SAMSUNG") && raw_width == 4704) { height -= top_margin = 8; width -= 2 * (left_margin = 8); load_flags = 32; - } else if (!strcmp(model,"NX200")) { + } else if (!strcmp(make,"SAMSUNG") && raw_width == 5632) { order = 0x4949; height = 3694; top_margin = 2; @@ -8304,6 +8316,8 @@ adobe_coeff ("SONY","DSC-R1"); width = 3925; order = 0x4d4d; + } else if (!strcmp(make,"SONY") && raw_width == 5504) { + width -= 8; } else if (!strcmp(make,"SONY") && raw_width == 6048) { width -= 24; } else if (!strcmp(model,"DSLR-A100")) { @@ -9390,7 +9404,7 @@ colorcheck(); #endif if (is_foveon) { - if (document_mode || model[0] == 'D') { + if (document_mode || load_raw == &CLASS foveon_dp_load_raw) { for (i=0; i < height*width*4; i++) if ((short) image[0][i] < 0) image[0][i] = 0; } else foveon_interpolate(); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org