Hello community, here is the log from the commit of package dcraw for openSUSE:Factory checked in at 2016-08-12 15:37:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dcraw (Old) and /work/SRC/openSUSE:Factory/.dcraw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dcraw" Changes: -------- --- /work/SRC/openSUSE:Factory/dcraw/dcraw.changes 2015-07-21 13:25:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dcraw.new/dcraw.changes 2016-08-12 15:37:22.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Aug 5 22:12:55 UTC 2016 - [email protected] + +- Update to version 9.27.0: + dcraw - revision 1.477 + * Added "-o 6" for ACES colorspace. + * Copied color matrices from DNG Converter 9.5.1. + * Support the Canon EOS 80D & IXUS 160, Fuji X-E2 & X-E2S & + X-Pro2. + +------------------------------------------------------------------- Old: ---- dcraw-9.26.0.tar.gz New: ---- dcraw-9.27.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dcraw.spec ++++++ --- /var/tmp/diff_new_pack.4ID837/_old 2016-08-12 15:37:23.000000000 +0200 +++ /var/tmp/diff_new_pack.4ID837/_new 2016-08-12 15:37:23.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package dcraw # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: dcraw -Version: 9.26.0 +Version: 9.27.0 Release: 0 Summary: Raw Digital Photo Decoding License: GPL-2.0+ @@ -123,7 +123,7 @@ %{_bindir}/fuji_green %{_bindir}/fujiturn %{_bindir}/fujiturn16 -%doc %{_mandir}/man1/dcraw.1%{ext_man} +%{_mandir}/man1/dcraw.1%{ext_man} %files lang -f %{name}.lang %defattr(-,root,root,-) ++++++ README ++++++ ++++ 727 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/dcraw/README ++++ and /work/SRC/openSUSE:Factory/.dcraw.new/README ++++++ dcraw-9.26.0.tar.gz -> dcraw-9.27.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw.1 new/dcraw/dcraw.1 --- old/dcraw/dcraw.1 2015-03-03 23:10:23.000000000 +0100 +++ new/dcraw/dcraw.1 2016-05-10 23:21:13.000000000 +0200 @@ -144,7 +144,7 @@ otherwise. Besides DNG, this option only affects Olympus, Leaf, and Phase One cameras. .TP -.B -o [0-5] +.B -o [0-6] Select the output colorspace when the .B -p option is not used: @@ -166,6 +166,9 @@ .br .B \t5 \ \ XYZ +.br +.B \t6 +\ \ ACES .TP .BR -p\ camera.icm \ [\ -o\ output.icm \ ] Use ICC profiles to define the camera's raw colorspace and the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw.c new/dcraw/dcraw.c --- old/dcraw/dcraw.c 2015-05-25 04:30:26.000000000 +0200 +++ new/dcraw/dcraw.c 2016-05-10 23:40:17.000000000 +0200 @@ -1,6 +1,6 @@ /* dcraw.c -- Dave Coffin's raw photo decoder - Copyright 1997-2015 by Dave Coffin, dcoffin a cybercom o net + Copyright 1997-2016 by Dave Coffin, dcoffin a cybercom o net This is a command-line ANSI C program to convert raw photos from any digital camera on any computer running any operating system. @@ -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.476 $ - $Date: 2015/05/25 02:29:14 $ + $Revision: 1.477 $ + $Date: 2016/05/10 21:30:43 $ */ -#define DCRAW_VERSION "9.26" +#define DCRAW_VERSION "9.27" #ifndef _GNU_SOURCE #define _GNU_SOURCE @@ -853,8 +853,10 @@ jh->restart = data[0] << 8 | data[1]; } } while (tag != 0xffda); + if (jh->bits > 16 || jh->clrs > 6 || + !jh->bits || !jh->high || !jh->wide || !jh->clrs) return 0; if (info_only) return 1; - if (jh->clrs > 6 || !jh->huff[0]) return 0; + if (!jh->huff[0]) return 0; FORC(19) if (!jh->huff[c+1]) jh->huff[c+1] = jh->huff[c]; if (jh->sraw) { FORC(4) jh->huff[2+c] = jh->huff[1]; @@ -1767,7 +1769,7 @@ pixel[col] = curve[pixel[col]]; } for (col=0; col < raw_width; col++) { - i = (pixel[col] << 2) - ph1.black + i = (pixel[col] << 2*(ph1.format != 8)) - ph1.black + cblack[row][col >= ph1.split_col] + rblack[col][row >= ph1.split_row]; if (i > 0) RAW(row,col) = i; @@ -2859,6 +2861,8 @@ fseek (ifp, seg[0][1]+1, SEEK_SET); getbits(-1); + if (seg[1][0] > raw_width*raw_height) + seg[1][0] = raw_width*raw_height; for (pix=seg[0][0]; pix < seg[1][0]; pix++) { for (s=0; s < 3; s++) { data = data << nbits | getbits(nbits); @@ -5307,7 +5311,7 @@ FORC4 cam_mul[c ^ (c >> 1) ^ 1] = get4(); } if (tag == 0x3d && type == 3 && len == 4) - FORC4 cblack[c ^ c >> 1] = get2() >> (14-tiff_ifd[2].bps); + FORC4 cblack[c ^ c >> 1] = get2() >> (14-tiff_bps); if (tag == 0x81 && type == 4) { data_offset = get4(); fseek (ifp, data_offset + 41, SEEK_SET); @@ -5418,7 +5422,7 @@ } if ((tag | 0x70) == 0x2070 && (type == 4 || type == 13)) fseek (ifp, get4()+base, SEEK_SET); - if (tag == 0x2020) + if (tag == 0x2020 && !strncmp(buf,"OLYMP",5)) parse_thumb_note (base, 257, 258); if (tag == 0x2040) parse_makernote (base, 0x2040); @@ -5732,6 +5736,8 @@ case 61443: tiff_ifd[ifd].samples = len & 7; tiff_ifd[ifd].bps = getint(type); + if (tiff_bps < tiff_ifd[ifd].bps) + tiff_bps = tiff_ifd[ifd].bps; break; case 61446: raw_height = 0; @@ -6065,7 +6071,7 @@ break; case 50715: /* BlackLevelDeltaH */ case 50716: /* BlackLevelDeltaV */ - for (num=i=0; i < len; i++) + for (num=i=0; i < (len & 0xffff); i++) num += getreal(type); black += num/len + 0.5; break; @@ -6206,6 +6212,10 @@ if (max_samp > 3) max_samp = 3; os = raw_width*raw_height; ns = tiff_ifd[i].width*tiff_ifd[i].height; + if (tiff_bps) { + os *= tiff_bps; + ns *= tiff_ifd[i].bps; + } if ((tiff_ifd[i].comp != 6 || tiff_ifd[i].samples != 3) && (tiff_ifd[i].width | tiff_ifd[i].height) < 0x10000 && ns && ((ns > os && (ties = 1)) || @@ -6300,8 +6310,8 @@ if (!dng_version) if ( (tiff_samples == 3 && tiff_ifd[raw].bytes && tiff_bps != 14 && (tiff_compress & -16) != 32768) - || (tiff_bps == 8 && !strcasestr(make,"Kodak") && - !strstr(model2,"DEBUG RAW"))) + || (tiff_bps == 8 && strncmp(make,"Phase",5) && + !strcasestr(make,"Kodak") && !strstr(model2,"DEBUG RAW"))) is_raw = 0; for (i=0; i < tiff_nifds; i++) if (i != raw && tiff_ifd[i].samples == max_samp && @@ -6721,7 +6731,7 @@ } else if (tag == 0xc000) { c = order; order = 0x4949; - if ((tag = get4()) > 10000) tag = get4(); + while ((tag = get4()) > raw_width); width = tag; height = get4(); order = c; @@ -6743,7 +6753,7 @@ order = 0x4d4d; len = get2() - 2; save = ftell(ifp); - if (mark == 0xc0 || mark == 0xc3) { + if (mark == 0xc0 || mark == 0xc3 || mark == 0xc9) { fgetc(ifp); raw_height = get2(); raw_width = get2(); @@ -7067,6 +7077,8 @@ { 6719,-994,-925,-4408,12426,2211,-887,2129,6051 } }, { "Canon EOS 70D", 0, 0x3bc7, { 7034,-804,-1014,-4420,12564,2058,-851,1994,5758 } }, + { "Canon EOS 80D", 0, 0, + { 7457,-671,-937,-4849,12495,2643,-1213,2354,5492 } }, { "Canon EOS 100D", 0, 0x350f, { 6602,-841,-939,-4472,12458,2247,-975,2039,6148 } }, { "Canon EOS 300D", 0, 0xfa0, @@ -7097,8 +7109,12 @@ { 6444,-904,-893,-4563,12308,2535,-903,2016,6728 } }, { "Canon EOS 1200D", 0, 0x37c2, { 6461,-907,-882,-4300,12184,2378,-819,1944,5931 } }, + { "Canon EOS 1300D", 0, 0x3510, + { 6939,-1016,-866,-4428,12473,2177,-1175,2178,6162 } }, { "Canon EOS M3", 0, 0, { 6362,-823,-847,-4426,12109,2616,-743,1857,5635 } }, + { "Canon EOS M10", 0, 0, + { 6400,-480,-888,-5294,13416,2047,-1296,2203,6137 } }, { "Canon EOS M", 0, 0, { 6602,-841,-939,-4472,12458,2247,-975,2039,6148 } }, { "Canon EOS-1Ds Mark III", 0, 0x3bb0, @@ -7117,6 +7133,8 @@ { 4374,3631,-1743,-7520,15212,2472,-2892,3632,8161 } }, { "Canon EOS-1D C", 0, 0x3c4e, { 6847,-614,-1014,-4669,12737,2139,-1197,2488,6846 } }, + { "Canon EOS-1D X Mark II", 0, 0, + { 7596,-978,-967,-4808,12571,2503,-1398,2567,5752 } }, { "Canon EOS-1D X", 0, 0x3c4e, { 6847,-614,-1014,-4669,12737,2139,-1197,2488,6846 } }, { "Canon EOS-1D", 0, 0xe20, @@ -7145,14 +7163,20 @@ { -4778,9467,2172,4743,-1141,4344,-5146,9908,6077,-1566,11051,557 } }, { "Canon PowerShot G2", 0, 0, { 9087,-2693,-1049,-6715,14382,2537,-2291,2819,7790 } }, + { "Canon PowerShot G3 X", 0, 0, + { 9701,-3857,-921,-3149,11537,1817,-786,1817,5147 } }, { "Canon PowerShot G3", 0, 0, { 9212,-2781,-1073,-6573,14189,2605,-2300,2844,7664 } }, + { "Canon PowerShot G5 X", 0, 0, + { 9602,-3823,-937,-2984,11495,1675,-407,1415,5049 } }, { "Canon PowerShot G5", 0, 0, { 9757,-2872,-933,-5972,13861,2301,-1622,2328,7212 } }, { "Canon PowerShot G6", 0, 0, { 9877,-3775,-871,-7613,14807,3072,-1448,1305,7485 } }, { "Canon PowerShot G7 X", 0, 0, { 9602,-3823,-937,-2984,11495,1675,-407,1415,5049 } }, + { "Canon PowerShot G9 X", 0, 0, + { 9602,-3823,-937,-2984,11495,1675,-407,1415,5049 } }, { "Canon PowerShot G9", 0, 0, { 7368,-2141,-598,-5621,13254,2625,-1418,1696,5743 } }, { "Canon PowerShot Pro1", 0, 0, @@ -7211,6 +7235,8 @@ { 14134,-5576,-1527,-1991,10719,1273,-1158,1929,3581 } }, { "Canon PowerShot SX220", 0, 0, /* DJC */ { 13898,-5076,-1447,-1405,10109,1297,-244,1860,3687 } }, + { "Canon IXUS 160", 0, 0, /* DJC */ + { 11657,-3781,-1136,-3544,11262,2283,-160,1219,4700 } }, { "Casio EX-S20", 0, 0, /* DJC */ { 11634,-3924,-1128,-4968,12954,2015,-1588,2648,7206 } }, { "Casio EX-Z750", 0, 0, /* DJC */ @@ -7225,6 +7251,8 @@ { 20183,-4295,-423,-3940,15330,3985,-280,4870,9800 } }, { "Contax N Digital", 0, 0xf1e, { 7777,1285,-1053,-9280,16543,2916,-3677,5679,7060 } }, + { "DXO ONE", 0, 0, + { 6596,-2079,-562,-4782,13016,1933,-970,1581,5181 } }, { "Epson R-D1", 0, 0, { 6827,-1878,-732,-8429,16012,2564,-704,592,7145 } }, { "Fujifilm E550", 0, 0, @@ -7305,25 +7333,31 @@ { 11768,-4971,-1133,-4904,12927,2183,-480,1723,4605 } }, { "Fujifilm X30", 0, 0, { 12328,-5256,-1144,-4469,12927,1675,-87,1291,4351 } }, + { "Fujifilm X70", 0, 0, + { 10450,-4329,-878,-3217,11105,2421,-752,1758,6519 } }, { "Fujifilm X-Pro1", 0, 0, { 10413,-3996,-993,-3721,11640,2361,-733,1540,6011 } }, + { "Fujifilm X-Pro2", 0, 0, + { 11434,-4948,-1210,-3746,12042,1903,-666,1479,5235 } }, { "Fujifilm X-A1", 0, 0, { 11086,-4555,-839,-3512,11310,2517,-815,1341,5940 } }, { "Fujifilm X-A2", 0, 0, { 10763,-4560,-917,-3346,11311,2322,-475,1135,5843 } }, { "Fujifilm X-E1", 0, 0, { 10413,-3996,-993,-3721,11640,2361,-733,1540,6011 } }, + { "Fujifilm X-E2S", 0, 0, + { 11562,-5118,-961,-3022,11007,2311,-525,1569,6097 } }, { "Fujifilm X-E2", 0, 0, { 8458,-2451,-855,-4597,12447,2407,-1475,2482,6526 } }, { "Fujifilm X-M1", 0, 0, { 10413,-3996,-993,-3721,11640,2361,-733,1540,6011 } }, { "Fujifilm X-S1", 0, 0, { 13509,-6199,-1254,-4430,12733,1865,-331,1441,5022 } }, - { "Fujifilm X-T1", 0, 0, + { "Fujifilm X-T1", 0, 0, /* also X-T10 */ { 8458,-2451,-855,-4597,12447,2407,-1475,2482,6526 } }, { "Fujifilm XF1", 0, 0, { 13509,-6199,-1254,-4430,12733,1865,-331,1441,5022 } }, - { "Fujifilm XQ", 0, 0, // XQ1 and XQ2 + { "Fujifilm XQ", 0, 0, /* XQ1 and XQ2 */ { 9252,-2704,-1064,-5893,14265,1717,-1101,2341,4349 } }, { "Imacon Ixpress", 0, 0, /* DJC */ { 7025,-1415,-704,-5188,13765,1424,-1248,2742,6038 } }, @@ -7465,8 +7499,12 @@ { 6988,-1384,-714,-5631,13410,2447,-1485,2204,7318 } }, { "Nikon D5500", 0, 0, { 8821,-2938,-785,-4178,12142,2287,-824,1651,6860 } }, + { "Nikon D500", 0, 0, + { 8813,-3210,-1036,-4703,12868,2021,-1054,1940,6129 } }, { "Nikon D50", 0, 0, { 7732,-2422,-789,-8238,15884,2498,-859,783,7330 } }, + { "Nikon D5", 0, 0, + { 9200,-3522,-992,-5755,13803,2117,-753,1486,6338 } }, { "Nikon D600", 0, 0x3e07, { 8178,-2245,-609,-4857,12394,2776,-1207,2086,7298 } }, { "Nikon D610", 0, 0, @@ -7543,8 +7581,8 @@ { 5958,-1559,-571,-4021,11453,2939,-634,1548,5087 } }, { "Nikon 1 J4", 0, 0, { 5958,-1559,-571,-4021,11453,2939,-634,1548,5087 } }, - { "Nikon 1 J5", 0, 0, /* DJC */ - { 2621,-856,500,-4471,8761,5711,-1321,2644,11945 } }, + { "Nikon 1 J5", 0, 0, + { 7520,-2518,-645,-3844,12102,1945,-913,2249,6835 } }, { "Nikon 1 S2", 200, 0, { 6612,-1342,-618,-3338,11055,2623,-174,1792,5075 } }, { "Nikon 1 V2", 0, 0, @@ -7555,6 +7593,8 @@ { 6588,-1305,-693,-3277,10987,2634,-355,2016,5106 } }, { "Nikon 1 ", 0, 0, /* J1, J2, S1, V1 */ { 8994,-2667,-865,-4594,12324,2552,-699,1786,6260 } }, + { "Olympus AIR A01", 0, 0, + { 8992,-3093,-639,-2563,10721,2122,-437,1270,5473 } }, { "Olympus C5050", 0, 0, { 10508,-3124,-1273,-6079,14294,1901,-1653,2306,6237 } }, { "Olympus C5060", 0, 0, @@ -7625,7 +7665,7 @@ { 7575,-2159,-571,-3722,11341,2725,-1434,2819,6271 } }, { "Olympus E-PM2", 0, 0, { 8380,-2630,-639,-2887,10725,2496,-627,1427,5438 } }, - { "Olympus E-M10", 0, 0, + { "Olympus E-M10", 0, 0, /* also E-M10 Mark II */ { 8380,-2630,-639,-2887,10725,2496,-627,1427,5438 } }, { "Olympus E-M1", 0, 0, { 7687,-1984,-606,-4327,11928,2721,-1381,2339,6452 } }, @@ -7633,6 +7673,8 @@ { 9422,-3258,-711,-2655,10898,2015,-512,1354,5512 } }, { "Olympus E-M5", 0, 0xfe1, { 8380,-2630,-639,-2887,10725,2496,-627,1427,5438 } }, + { "Olympus PEN-F", 0, 0, + { 9476,-3182,-765,-2613,10958,1893,-449,1315,5268 } }, { "Olympus SH-2", 0, 0, { 10156,-3425,-1077,-2611,11177,1624,-385,1592,5080 } }, { "Olympus SP350", 0, 0, @@ -7687,6 +7729,12 @@ { 8843,-2837,-625,-5025,12644,2668,-411,1234,7410 } }, { "Pentax K-r", 0, 0, { 9895,-3077,-850,-5304,13035,2521,-883,1768,6936 } }, + { "Pentax K-1", 0, 0, + { 8566,-2746,-1201,-3612,12204,1550,-893,1680,6264 } }, + { "Pentax K-30", 0, 0, + { 8710,-2632,-1167,-3995,12301,1881,-981,1719,6535 } }, + { "Pentax K-3 II", 0, 0, + { 8626,-2607,-1155,-3995,12301,1881,-1039,1822,6925 } }, { "Pentax K-3", 0, 0, { 7415,-2052,-721,-5186,12788,2682,-1446,2157,6773 } }, { "Pentax K-5 II", 0, 0, @@ -7697,8 +7745,8 @@ { 9142,-2947,-678,-8648,16967,1663,-2224,2898,8615 } }, { "Pentax K-S1", 0, 0, { 8512,-3211,-787,-4167,11966,2487,-638,1288,6054 } }, - { "Pentax K-S2", 0, 0, /* DJC */ - { 5322,-2195,41,-3689,8902,4788,-858,1831,7969 } }, + { "Pentax K-S2", 0, 0, + { 8662,-3280,-798,-3928,11771,2444,-586,1232,6054 } }, { "Pentax Q-S1", 0, 0, { 12995,-5593,-1107,-1879,10139,2027,-64,1233,4919 } }, { "Pentax 645D", 0, 0x3e00, @@ -7711,6 +7759,10 @@ { 9932,-3060,-935,-5809,13331,2753,-1267,2155,5575 } }, { "Panasonic DMC-FZ28", 15, 0xf96, { 10109,-3488,-993,-5412,12812,2916,-1305,2140,5543 } }, + { "Panasonic DMC-FZ330", 15, 0, + { 8378,-2798,-769,-3068,11410,1877,-538,1792,4623 } }, + { "Panasonic DMC-FZ300", 15, 0, + { 8378,-2798,-769,-3068,11410,1877,-538,1792,4623 } }, { "Panasonic DMC-FZ30", 0, 0xf94, { 10976,-4029,-1141,-7918,15491,2600,-1670,2071,8246 } }, { "Panasonic DMC-FZ3", 15, 0, @@ -7791,6 +7843,8 @@ { 7798,-2562,-740,-3879,11584,2613,-1055,2248,5434 } }, { "Panasonic DMC-G6", 15, 0xfff, { 8294,-2891,-651,-3869,11590,2595,-1183,2267,5352 } }, + { "Panasonic DMC-G7", 15, 0xfff, + { 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 } }, { "Panasonic DMC-GF1", 15, 0xf92, { 7888,-1902,-1011,-8106,16085,2099,-2353,2866,7330 } }, { "Panasonic DMC-GF2", 15, 0xfff, @@ -7803,6 +7857,8 @@ { 8130,-2801,-946,-3520,11289,2552,-1314,2511,5791 } }, { "Panasonic DMC-GF7", 15, 0, { 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 } }, + { "Panasonic DMC-GF8", 15, 0, + { 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 } }, { "Panasonic DMC-GH1", 15, 0xf92, { 6299,-1466,-532,-6535,13852,2969,-2331,3112,5984 } }, { "Panasonic DMC-GH2", 15, 0xf95, @@ -7819,6 +7875,12 @@ { 6763,-1919,-863,-3868,11515,2684,-1216,2387,5879 } }, { "Panasonic DMC-GX7", 15, 0, { 7610,-2780,-576,-4614,12195,2733,-1375,2393,6490 } }, + { "Panasonic DMC-GX8", 15, 0, + { 7564,-2263,-606,-3148,11239,2177,-540,1435,4853 } }, + { "Panasonic DMC-TZ1", 15, 0, + { 7790,-2736,-755,-3452,11870,1769,-628,1647,4898 } }, + { "Panasonic DMC-ZS1", 15, 0, + { 7790,-2736,-755,-3452,11870,1769,-628,1647,4898 } }, { "Panasonic DMC-TZ6", 15, 0, { 8607,-2822,-808,-3755,11930,2049,-820,2060,5224 } }, { "Panasonic DMC-ZS4", 15, 0, @@ -7827,6 +7889,20 @@ { 8802,-3135,-789,-3151,11468,1904,-550,1745,4810 } }, { "Panasonic DMC-ZS5", 15, 0, { 8802,-3135,-789,-3151,11468,1904,-550,1745,4810 } }, + { "Panasonic DMC-TZ8", 15, 0, + { 8550,-2908,-842,-3195,11529,1881,-338,1603,4631 } }, + { "Panasonic DMC-ZS6", 15, 0, + { 8550,-2908,-842,-3195,11529,1881,-338,1603,4631 } }, + { "Leica S (Typ 007)", 0, 0, + { 6063,-2234,-231,-5210,13787,1500,-1043,2866,6997 } }, + { "Leica X", 0, 0, /* X and X-U, both (Typ 113) */ + { 7712,-2059,-653,-3882,11494,2726,-710,1332,5958 } }, + { "Leica Q (Typ 116)", 0, 0, + { 11865,-4523,-1441,-5423,14458,935,-1587,2687,4830 } }, + { "Leica M (Typ 262)", 0, 0, + { 6653,-1486,-611,-4221,13303,929,-881,2416,7226 } }, + { "Leica SL (Typ 601)", 0, 0, + { 11865,-4523,-1441,-5423,14458,935,-1587,2687,4830} }, { "Phase One H 20", 0, 0, /* DJC */ { 1313,1855,-109,-6715,15908,808,-327,1840,6020 } }, { "Phase One H 25", 0, 0, @@ -7845,6 +7921,10 @@ { 14603,-4122,-528,-1810,9794,2017,-297,2763,5936 } }, { "Red One", 704, 0xffff, /* DJC */ { 21014,-7891,-2613,-3056,12201,856,-2203,5125,8042 } }, + { "Ricoh GR II", 0, 0, + { 4630,-834,-423,-4977,12805,2417,-638,1467,6115 } }, + { "Ricoh GR", 0, 0, + { 3708,-543,-160,-5381,12254,3556,-1471,1929,8234 } }, { "Samsung EX1", 0, 0x3e00, { 8898,-2498,-994,-3144,11328,2066,-760,1381,4576 } }, { "Samsung EX2F", 0, 0x7ff, @@ -7853,6 +7933,8 @@ { 7557,-2522,-739,-4679,12949,1894,-840,1777,5311 } }, { "Samsung NX mini", 0, 0, { 5222,-1196,-550,-6540,14649,2009,-1666,2819,5657 } }, + { "Samsung NX3300", 0, 0, + { 8060,-2933,-761,-4504,12890,1762,-630,1489,5227 } }, { "Samsung NX3000", 0, 0, { 8060,-2933,-761,-4504,12890,1762,-630,1489,5227 } }, { "Samsung NX30", 0, 0, /* NX30, NX300, NX300M */ @@ -7887,17 +7969,19 @@ { 16442,-2956,-2422,-2877,12128,750,-1136,6066,4559 } }, { "Sony DSC-F828", 0, 0, { 7924,-1910,-777,-8226,15459,2998,-1517,2199,6818,-7242,11401,3481 } }, - { "Sony DSC-R1", 512, 0, + { "Sony DSC-R1", 0, 0, { 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-RX100M", 200, 0, /* M2 and M3 */ + { "Sony DSC-RX100M", 0, 0, /* M2, M3, and M4 */ { 6596,-2079,-562,-4782,13016,1933,-970,1581,5181 } }, - { "Sony DSC-RX100", 200, 0, + { "Sony DSC-RX100", 0, 0, { 8651,-2754,-1057,-3464,12207,1373,-568,1398,4434 } }, - { "Sony DSC-RX10", 200, 0, + { "Sony DSC-RX10", 0, 0, /* also RX10M2 */ { 6679,-1825,-745,-5047,13256,1953,-1580,2422,5183 } }, - { "Sony DSC-RX1", 128, 0, + { "Sony DSC-RX1RM2", 0, 0, + { 6629,-1900,-483,-4618,12349,2550,-622,1381,6514 } }, + { "Sony DSC-RX1", 0, 0, { 6344,-1612,-462,-4863,12477,2681,-865,1786,6899 } }, { "Sony DSLR-A100", 0, 0xfeb, { 9437,-2811,-774,-8405,16215,2290,-710,596,7181 } }, @@ -7915,71 +7999,77 @@ { 6038,-1484,-579,-9145,16746,2512,-875,746,7218 } }, { "Sony DSLR-A390", 0, 0, { 6038,-1484,-579,-9145,16746,2512,-875,746,7218 } }, - { "Sony DSLR-A450", 128, 0xfeb, + { "Sony DSLR-A450", 0, 0xfeb, { 4950,-580,-103,-5228,12542,3029,-709,1435,7371 } }, - { "Sony DSLR-A580", 128, 0xfeb, + { "Sony DSLR-A580", 0, 0xfeb, { 5932,-1492,-411,-4813,12285,2856,-741,1524,6739 } }, - { "Sony DSLR-A500", 128, 0xfeb, + { "Sony DSLR-A500", 0, 0xfeb, { 6046,-1127,-278,-5574,13076,2786,-691,1419,7625 } }, - { "Sony DSLR-A5", 128, 0xfeb, + { "Sony DSLR-A5", 0, 0xfeb, { 4950,-580,-103,-5228,12542,3029,-709,1435,7371 } }, - { "Sony DSLR-A700", 128, 0, + { "Sony DSLR-A700", 0, 0, { 5775,-805,-359,-8574,16295,2391,-1943,2341,7249 } }, - { "Sony DSLR-A850", 128, 0, + { "Sony DSLR-A850", 0, 0, { 5413,-1162,-365,-5665,13098,2866,-608,1179,8440 } }, - { "Sony DSLR-A900", 128, 0, + { "Sony DSLR-A900", 0, 0, { 5209,-1072,-397,-8845,16120,2919,-1618,1803,8654 } }, - { "Sony ILCA-77M2", 128, 0, + { "Sony ILCA-68", 0, 0, + { 6435,-1903,-536,-4722,12449,2550,-663,1363,6517 } }, + { "Sony ILCA-77M2", 0, 0, { 5991,-1732,-443,-4100,11989,2381,-704,1467,5992 } }, - { "Sony ILCE-7M2", 128, 0, + { "Sony ILCE-6300", 0, 0, + { 5973,-1695,-419,-3826,11797,2293,-639,1398,5789 } }, + { "Sony ILCE-7M2", 0, 0, { 5271,-712,-347,-6153,13653,2763,-1601,2366,7242 } }, - { "Sony ILCE-7S", 128, 0, + { "Sony ILCE-7S", 0, 0, /* also ILCE-7SM2 */ { 5838,-1430,-246,-3497,11477,2297,-748,1885,5778 } }, - { "Sony ILCE-7R", 128, 0, + { "Sony ILCE-7RM2", 0, 0, + { 6629,-1900,-483,-4618,12349,2550,-622,1381,6514 } }, + { "Sony ILCE-7R", 0, 0, { 4913,-541,-202,-6130,13513,2906,-1564,2151,7183 } }, - { "Sony ILCE-7", 128, 0, + { "Sony ILCE-7", 0, 0, { 5271,-712,-347,-6153,13653,2763,-1601,2366,7242 } }, - { "Sony ILCE", 128, 0, /* 3000, 5000, 5100, 6000, and QX1 */ + { "Sony ILCE", 0, 0, /* 3000, 5000, 5100, 6000, and QX1 */ { 5991,-1456,-455,-4764,12135,2980,-707,1425,6701 } }, - { "Sony NEX-5N", 128, 0, + { "Sony NEX-5N", 0, 0, { 5991,-1456,-455,-4764,12135,2980,-707,1425,6701 } }, - { "Sony NEX-5R", 128, 0, + { "Sony NEX-5R", 0, 0, { 6129,-1545,-418,-4930,12490,2743,-977,1693,6615 } }, - { "Sony NEX-5T", 128, 0, + { "Sony NEX-5T", 0, 0, { 6129,-1545,-418,-4930,12490,2743,-977,1693,6615 } }, - { "Sony NEX-3N", 128, 0, + { "Sony NEX-3N", 0, 0, { 6129,-1545,-418,-4930,12490,2743,-977,1693,6615 } }, { "Sony NEX-3", 138, 0, /* DJC */ { 6907,-1256,-645,-4940,12621,2320,-1710,2581,6230 } }, { "Sony NEX-5", 116, 0, /* DJC */ { 6807,-1350,-342,-4216,11649,2567,-1089,2001,6420 } }, - { "Sony NEX-3", 128, 0, /* Adobe */ + { "Sony NEX-3", 0, 0, /* Adobe */ { 6549,-1550,-436,-4880,12435,2753,-854,1868,6976 } }, - { "Sony NEX-5", 128, 0, /* Adobe */ + { "Sony NEX-5", 0, 0, /* Adobe */ { 6549,-1550,-436,-4880,12435,2753,-854,1868,6976 } }, - { "Sony NEX-6", 128, 0, + { "Sony NEX-6", 0, 0, { 6129,-1545,-418,-4930,12490,2743,-977,1693,6615 } }, - { "Sony NEX-7", 128, 0, + { "Sony NEX-7", 0, 0, { 5491,-1192,-363,-4951,12342,2948,-911,1722,7192 } }, - { "Sony NEX", 128, 0, /* NEX-C3, NEX-F3 */ + { "Sony NEX", 0, 0, /* NEX-C3, NEX-F3 */ { 5991,-1456,-455,-4764,12135,2980,-707,1425,6701 } }, - { "Sony SLT-A33", 128, 0, + { "Sony SLT-A33", 0, 0, { 6069,-1221,-366,-5221,12779,2734,-1024,2066,6834 } }, - { "Sony SLT-A35", 128, 0, + { "Sony SLT-A35", 0, 0, { 5986,-1618,-415,-4557,11820,3120,-681,1404,6971 } }, - { "Sony SLT-A37", 128, 0, + { "Sony SLT-A37", 0, 0, { 5991,-1456,-455,-4764,12135,2980,-707,1425,6701 } }, - { "Sony SLT-A55", 128, 0, + { "Sony SLT-A55", 0, 0, { 5932,-1492,-411,-4813,12285,2856,-741,1524,6739 } }, - { "Sony SLT-A57", 128, 0, + { "Sony SLT-A57", 0, 0, { 5991,-1456,-455,-4764,12135,2980,-707,1425,6701 } }, - { "Sony SLT-A58", 128, 0, + { "Sony SLT-A58", 0, 0, { 5991,-1456,-455,-4764,12135,2980,-707,1425,6701 } }, - { "Sony SLT-A65", 128, 0, + { "Sony SLT-A65", 0, 0, { 5491,-1192,-363,-4951,12342,2948,-911,1722,7192 } }, - { "Sony SLT-A77", 128, 0, + { "Sony SLT-A77", 0, 0, { 5491,-1192,-363,-4951,12342,2948,-911,1722,7192 } }, - { "Sony SLT-A99", 128, 0, + { "Sony SLT-A99", 0, 0, { 6344,-1612,-462,-4863,12477,2681,-865,1786,6899 } }, }; double cam_xyz[4][3]; @@ -8137,6 +8227,7 @@ { 5792, 3804, 158, 51, 0, 0 }, { 5920, 3950, 122, 80, 2, 0 }, { 6096, 4056, 72, 34, 0, 0 }, + { 6288, 4056, 264, 34, 0, 0 }, { 8896, 5920, 160, 64, 0, 0 }, }; static const struct { @@ -8150,6 +8241,7 @@ { 0x261, "EOS 50D" }, { 0x281, "EOS-1D Mark IV" }, { 0x287, "EOS 60D" }, { 0x167, "EOS-1DS" }, { 0x325, "EOS 70D" }, + { 0x350, "EOS 80D" }, { 0x328, "EOS-1D X Mark II" }, { 0x170, "EOS 300D" }, { 0x188, "EOS-1Ds Mark II" }, { 0x176, "EOS 450D" }, { 0x215, "EOS-1Ds Mark III" }, { 0x189, "EOS 350D" }, { 0x324, "EOS-1D C" }, @@ -8163,7 +8255,8 @@ { 0x347, "EOS 760D" }, { 0x254, "EOS 1000D" }, { 0x288, "EOS 1100D" }, - { 0x327, "EOS 1200D" }, + { 0x327, "EOS 1200D" }, { 0x382, "Canon EOS 5DS" }, + { 0x404, "EOS 1300D" }, { 0x401, "Canon EOS 5DS R" }, { 0x346, "EOS 100D" }, }, sonique[] = { { 0x002, "DSC-R1" }, { 0x100, "DSLR-A100" }, @@ -8191,7 +8284,10 @@ { 0x139, "ILCE-5000" }, { 0x13d, "DSC-RX100M3" }, { 0x13e, "ILCE-7S" }, { 0x13f, "ILCA-77M2" }, { 0x153, "ILCE-5100" }, { 0x154, "ILCE-7M2" }, - { 0x15a, "ILCE-QX1" }, + { 0x155, "DSC-RX100M4" },{ 0x156, "DSC-RX10M2" }, + { 0x158, "DSC-RX1RM2" }, { 0x15a, "ILCE-QX1" }, + { 0x15b, "ILCE-7RM2" }, { 0x15e, "ILCE-7SM2" }, + { 0x161, "ILCA-68" }, { 0x165, "ILCE-6300" }, }; static const struct { unsigned fsize; @@ -8228,6 +8324,7 @@ { 19131120,4168,3060,92,16, 4, 1,40,0x94,0,2,"Canon","PowerShot SX220 HS" }, { 21936096,4464,3276,25,10,73,12,40,0x16,0,2,"Canon","PowerShot SX30 IS" }, { 24724224,4704,3504, 8,16,56, 8,40,0x94,0,2,"Canon","PowerShot A3300 IS" }, + { 30858240,5248,3920, 8,16,56,16,40,0x94,0,2,"Canon","IXUS 160" }, { 1976352,1632,1211, 0, 2, 0, 1, 0,0x94,0,1,"Casio","QV-2000UX" }, { 3217760,2080,1547, 0, 0,10, 1, 0,0x94,0,1,"Casio","QV-3*00EX" }, { 6218368,2585,1924, 0, 0, 9, 0, 0,0x94,0,1,"Casio","QV-5700" }, @@ -8304,7 +8401,7 @@ static const char *corp[] = { "AgfaPhoto", "Canon", "Casio", "Epson", "Fujifilm", "Mamiya", "Minolta", "Motorola", "Kodak", "Konica", "Leica", - "Nikon", "Nokia", "Olympus", "Pentax", "Phase One", "Ricoh", + "Nikon", "Nokia", "Olympus", "Ricoh", "Pentax", "Phase One", "Samsung", "Sigma", "Sinar", "Sony" }; char head[32], *cp; int hlen, flen, fsize, zero_fsize=1, i, c; @@ -8621,6 +8718,8 @@ top_margin = filters = 0; strcpy (model,"C603"); } + if (!strcmp(make,"Sony") && raw_width > 3888) + black = 128 << (tiff_bps - 12); if (is_foveon) { if (height*2 < width) pixel_aspect = 0.5; if (height > width) pixel_aspect = 2; @@ -8814,7 +8913,7 @@ top_margin = (raw_height - height) >> 2 << 1; left_margin = (raw_width - width ) >> 2 << 1; if (width == 2848 || width == 3664) filters = 0x16161616; - if (width == 4032 || width == 4952) left_margin = 0; + if (width == 4032 || width == 4952 || width == 6032) left_margin = 0; if (width == 3328 && (width -= 66)) left_margin = 34; if (width == 4936) left_margin = 4; if (!strcmp(model,"HS50EXR") || @@ -9057,6 +9156,8 @@ thumb_length = flen - (thumb_offset = 0xa39800); thumb_height = 480; thumb_width = 640; + } else if (!strcmp(model,"TG-4")) { + width -= 16; } } else if (!strcmp(model,"N Digital")) { height = 2047; @@ -9084,16 +9185,29 @@ order = 0x4d4d; } else if (!strcmp(make,"Sony") && raw_width == 4288) { width -= 32; + } else if (!strcmp(make,"Sony") && raw_width == 4600) { + if (!strcmp(model,"DSLR-A350")) + height -= 4; + black = 0; } else if (!strcmp(make,"Sony") && raw_width == 4928) { if (height < 3280) width -= 8; } else if (!strcmp(make,"Sony") && raw_width == 5504) { width -= height > 3664 ? 8 : 32; + if (!strncmp(model,"DSC",3)) + black = 200 << (tiff_bps - 12); } else if (!strcmp(make,"Sony") && raw_width == 6048) { width -= 24; if (strstr(model,"RX1") || strstr(model,"A99")) width -= 6; } else if (!strcmp(make,"Sony") && raw_width == 7392) { width -= 30; + } else if (!strcmp(make,"Sony") && raw_width == 8000) { + width -= 32; + if (!strncmp(model,"DSC",3)) { + tiff_bps = 14; + load_raw = &CLASS unpacked_load_raw; + black = 512; + } } else if (!strcmp(model,"DSLR-A100")) { if (width == 3880) { height--; @@ -9105,8 +9219,6 @@ load_flags = 2; } filters = 0x61616161; - } else if (!strcmp(model,"DSLR-A350")) { - height -= 4; } else if (!strcmp(model,"PIXL")) { height -= top_margin = 4; width -= left_margin = 32; @@ -9171,6 +9283,7 @@ width = 768; data_offset = 1152; load_raw = &CLASS kodak_radc_load_raw; + tiff_bps = 12; } else if (strstr(model,"DC50")) { strcpy (model, "DC50"); height = 512; @@ -9363,10 +9476,14 @@ { { 0.529317, 0.330092, 0.140588 }, { 0.098368, 0.873465, 0.028169 }, { 0.016879, 0.117663, 0.865457 } }; + static const double aces_rgb[3][3] = + { { 0.432996, 0.375380, 0.189317 }, + { 0.089427, 0.816523, 0.102989 }, + { 0.019165, 0.118150, 0.941914 } }; static const double (*out_rgb[])[3] = - { rgb_rgb, adobe_rgb, wide_rgb, prophoto_rgb, xyz_rgb }; + { rgb_rgb, adobe_rgb, wide_rgb, prophoto_rgb, xyz_rgb, aces_rgb }; static const char *name[] = - { "sRGB", "Adobe RGB (1998)", "WideGamut D65", "ProPhoto D65", "XYZ" }; + { "sRGB", "Adobe RGB (1998)", "WideGamut D65", "ProPhoto D65", "XYZ", "ACES" }; static const unsigned phead[] = { 1024, 0, 0x2100000, 0x6d6e7472, 0x52474220, 0x58595a20, 0, 0, 0, 0x61637370, 0, 0, 0x6e6f6e65, 0, 0, 0, 0, 0xf6d6, 0x10000, 0xd32d }; @@ -9387,7 +9504,7 @@ gamma_curve (gamm[0], gamm[1], 0, 0); memcpy (out_cam, rgb_cam, sizeof out_cam); raw_color |= colors == 1 || document_mode || - output_color < 1 || output_color > 5; + output_color < 1 || output_color > 6; if (!raw_color) { oprof = (unsigned *) calloc (phead[0], 1); merror (oprof, "convert_to_rgb()"); @@ -9765,7 +9882,7 @@ puts(_("-n <num> Set threshold for wavelet denoising")); puts(_("-H [0-9] Highlight mode (0=clip, 1=unclip, 2=blend, 3+=rebuild)")); puts(_("-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)")); - puts(_("-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)")); + puts(_("-o [0-6] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)")); #ifndef NO_LCMS puts(_("-o <file> Apply output ICC profile from file")); puts(_("-p <file> Apply camera ICC profile from file or \"embed\"")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_ca.1 new/dcraw/dcraw_ca.1 --- old/dcraw/dcraw_ca.1 2009-05-14 22:50:27.000000000 +0200 +++ new/dcraw/dcraw_ca.1 2016-05-10 23:21:13.000000000 +0200 @@ -138,7 +138,7 @@ .B -M Aquesta opció només afecta a les càmeres Olympus, Leaf i Phase One. .TP -.B -o [0-5] +.B -o [0-6] Selecciona l'espai de color de sortida quan la opció .B -p no s'utilitza: @@ -160,6 +160,9 @@ .br .B \t5 \ \ XYZ +.br +.B \t6 +\ \ ACES .TP .BR -p\ càmera.icm \ [\ -o\ sortida.icm \ ] Utilitza perfils de color ICC per a definir l'espai de color cru de diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_ca.po new/dcraw/dcraw_ca.po --- old/dcraw/dcraw_ca.po 2011-07-23 23:55:41.000000000 +0200 +++ new/dcraw/dcraw_ca.po 2016-05-10 23:21:16.000000000 +0200 @@ -190,8 +190,8 @@ msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" msgstr "-t [0-7] Gira la imatge (0=res, 3=180, 5=90AH, 6=90H)" -msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" -msgstr "-o [0-5] Trieu l'espai de color de la sortida (cru,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgid "-o [0-6] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" +msgstr "-o [0-6] Trieu l'espai de color de la sortida (cru,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" msgid "-o <file> Apply output ICC profile from file" msgstr "-o <fitx> Aplica el perfil de color ICC de sortida des d'un fitxer" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_cs.1 new/dcraw/dcraw_cs.1 --- old/dcraw/dcraw_cs.1 2008-04-19 20:38:36.000000000 +0200 +++ new/dcraw/dcraw_cs.1 2016-05-10 23:21:13.000000000 +0200 @@ -139,7 +139,7 @@ .BR -M . Tato volba se projeví pouze ve spojení s fotoaparáty Olympus, Leaf a Phase One. .TP -.B -o [0-5] +.B -o [0-6] Vybere výstupní barevný profil, pokud není současně použita volba .B -p : @@ -161,6 +161,9 @@ .br .B \t5 \ \ XYZ +.br +.B \t6 +\ \ ACES .TP .BR -p\ fotoaparát.icm \ [\ -o\ výstupní.icm \ ] Použije ICC barevný profil ze souboru fotoaparát.icm. Pro výstup je ve výchozím diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_cs.po new/dcraw/dcraw_cs.po --- old/dcraw/dcraw_cs.po 2011-07-23 23:55:41.000000000 +0200 +++ new/dcraw/dcraw_cs.po 2016-05-10 23:21:16.000000000 +0200 @@ -211,8 +211,8 @@ msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" msgstr "-t [0-7] Otoč obrázek (0=ne, 3=180°, 5 = 90° doleva, 6=90° doprava)" -msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" -msgstr "-o [0-5] Výstupní barevný profil (cru, sRGB, Adobe, Wide, ProPhoto, XYZ)" +msgid "-o [0-6] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" +msgstr "-o [0-6] Výstupní barevný profil (cru, sRGB, Adobe, Wide, ProPhoto, XYZ)" msgid "-o <file> Apply output ICC profile from file" msgstr "-o <soubor> Aplikuj ICC barevný profil ze souboru" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_da.1 new/dcraw/dcraw_da.1 --- old/dcraw/dcraw_da.1 2015-03-06 08:12:51.000000000 +0100 +++ new/dcraw/dcraw_da.1 2016-05-10 23:21:13.000000000 +0200 @@ -142,7 +142,7 @@ ellers. Foruden DNG har dette tilvalg har kun effekt med Olympus-, Leaf- og Phase One-kameraer. .TP -.B -o [0-5] +.B -o [0-6] Vælg uddata-farverummet når .B -p ikke anvendes: @@ -164,6 +164,9 @@ .br .B \t5 \ \ XYZ +.br +.B \t6 +\ \ ACES .TP .BR -p\ kamera.icm \ [\ -o\ uddata.icm \ ] Anvend ICC-profiler for at definere kameraets rå farverum og det diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_da.po new/dcraw/dcraw_da.po --- old/dcraw/dcraw_da.po 2015-03-03 23:15:06.000000000 +0100 +++ new/dcraw/dcraw_da.po 2016-05-10 23:21:16.000000000 +0200 @@ -189,8 +189,8 @@ msgstr "" "-t [0-7] Drej billedet (0=drej ikke, 3=180, 5=90 mod uret, 6=90 med uret)" -msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" -msgstr "-o [0-5] Uddata-farverum (rå,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgid "-o [0-6] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" +msgstr "-o [0-6] Uddata-farverum (rå,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" msgid "-o <file> Apply output ICC profile from file" msgstr "-o <fil> Anvend ICC-profil fra fil på uddata" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_de.1 new/dcraw/dcraw_de.1 --- old/dcraw/dcraw_de.1 2009-05-14 22:54:02.000000000 +0200 +++ new/dcraw/dcraw_de.1 2016-05-10 23:21:13.000000000 +0200 @@ -143,7 +143,7 @@ .BR -M . Diese Option betrifft nur Olympus, Leaf und Phase One Kameras. .TP -.B -o [0-5] +.B -o [0-6] Wählt den Farbraum der Ausgabe aus, wenn .B -p nicht verwendet wird: @@ -165,6 +165,9 @@ .br .B \t5 \ \ XYZ +.br +.B \t6 +\ \ ACES .TP .BR -p\ kamera.icm \ [\ -o\ ausgabe.icm \ ] Verwende ICC Profile um den RAW Farbraum der Kamera diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_de.po new/dcraw/dcraw_de.po --- old/dcraw/dcraw_de.po 2011-07-23 23:55:41.000000000 +0200 +++ new/dcraw/dcraw_de.po 2016-05-10 23:21:16.000000000 +0200 @@ -212,8 +212,8 @@ msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" msgstr "-t [0-7] Bild drehen (0=0 Grad, 3=180, 5=90 links, 6=90 rechts)" -msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" -msgstr "-o [0-5] Farbraum der Ausgabe (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgid "-o [0-6] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" +msgstr "-o [0-6] Farbraum der Ausgabe (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" msgid "-o <file> Apply output ICC profile from file" msgstr "-o <Datei> Wende Ausgabe ICC Profil aus Datei an" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_eo.1 new/dcraw/dcraw_eo.1 --- old/dcraw/dcraw_eo.1 2015-03-03 23:10:23.000000000 +0100 +++ new/dcraw/dcraw_eo.1 2016-05-10 23:21:13.000000000 +0200 @@ -144,7 +144,7 @@ alikaze. Krom DNG, tiu ĉi opcio koncernas nur fotilojn Olympus, Leaf, kaj Phase One. .TP -.B -o [0-5] +.B -o [0-6] Elektu la eligotan kolorspacon kiam ne uziĝas la opcio .B -p : @@ -166,6 +166,9 @@ .br .B \t5 \ \ XYZ +.br +.B \t6 +\ \ ACES .TP .BR -p\ fotilo.icm \ [\ -o\ eligo.icm \ ] Uzu ICC profilojn por difini la krudan kolorspacon de la fotilo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_eo.po new/dcraw/dcraw_eo.po --- old/dcraw/dcraw_eo.po 2015-02-25 00:26:59.000000000 +0100 +++ new/dcraw/dcraw_eo.po 2016-05-10 23:21:16.000000000 +0200 @@ -187,8 +187,8 @@ msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" msgstr "-t [0-7] Turnu bildon (0=ne turnu, 3=180, 5=90mal, 6=90dek)" -msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" -msgstr "-o [0-5] Eliga kolorspaco (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgid "-o [0-6] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" +msgstr "-o [0-6] Eliga kolorspaco (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" msgid "-o <file> Apply output ICC profile from file" msgstr "-o <dos> Apliku eligan ICC-profilon el dosiero" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_es.1 new/dcraw/dcraw_es.1 --- old/dcraw/dcraw_es.1 2009-05-14 22:45:40.000000000 +0200 +++ new/dcraw/dcraw_es.1 2016-05-10 23:21:13.000000000 +0200 @@ -139,7 +139,7 @@ en otro caso. Esta opción solo afecta a las cámaras Olympus, Leaf y Phase One. .TP -.B -o [0-5] +.B -o [0-6] Seleccionar el espacio de color de salida cuando la opción .B -p no se utiliza: @@ -161,6 +161,9 @@ .br .B \t5 \ \ XYZ +.br +.B \t6 +\ \ ACES .TP .BR -p\ cámara.icm \ [\ -o\ salida.icm \ ] Usar perfiles ICC para definir el espacio de color crudo de diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_es.po new/dcraw/dcraw_es.po --- old/dcraw/dcraw_es.po 2011-07-23 23:55:41.000000000 +0200 +++ new/dcraw/dcraw_es.po 2016-05-10 23:21:16.000000000 +0200 @@ -214,8 +214,8 @@ msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" msgstr "-t [0-7] Rotar la imagen (0=nada, 3=180, 5=90AH, 6=90H)" -msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" -msgstr "-o [0-5] Espacio de color de salida (cru,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgid "-o [0-6] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" +msgstr "-o [0-6] Espacio de color de salida (cru,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" msgid "-o <file> Apply output ICC profile from file" msgstr "-o <arch> Aplicar el perfil ICC de salida desde archivo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_fr.1 new/dcraw/dcraw_fr.1 --- old/dcraw/dcraw_fr.1 2015-04-06 23:32:51.000000000 +0200 +++ new/dcraw/dcraw_fr.1 2016-05-10 23:21:13.000000000 +0200 @@ -155,7 +155,7 @@ sinon. A part DNG, cette opinion est applicable aux appareils Olympus, Leaf et Phase One. .TP -.B -o [0-5] +.B -o [0-6] Sélectionne l'espace de couleur de sortie quand l'option .B -p n'est pas utilisée : @@ -177,6 +177,9 @@ .br .B \t5 \ \ XYZ +.br +.B \t6 +\ \ ACES .TP .BR -p\ appareilphoto.icm \ [\ -o\ sortie.icm \ ] Utilise le profil ICC pour définir l'espace de couleur de diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_fr.po new/dcraw/dcraw_fr.po --- old/dcraw/dcraw_fr.po 2015-04-06 23:34:59.000000000 +0200 +++ new/dcraw/dcraw_fr.po 2016-05-10 23:21:16.000000000 +0200 @@ -187,8 +187,8 @@ msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" msgstr "-t [0-7] Tourne l'image (0=aucun, 3=180, 5=90 gauche, 6=90 droite)" -msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" -msgstr "-o [0-5] Espace de couleur de sortie (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgid "-o [0-6] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" +msgstr "-o [0-6] Espace de couleur de sortie (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" msgid "-o <file> Apply output ICC profile from file" msgstr "-o <fich> Utilise le fichier comme espace de couleur en sortie" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_hu.1 new/dcraw/dcraw_hu.1 --- old/dcraw/dcraw_hu.1 2007-11-18 02:24:54.000000000 +0100 +++ new/dcraw/dcraw_hu.1 2016-05-10 23:21:13.000000000 +0200 @@ -173,7 +173,7 @@ .BR -H\ 3 opcióval generált képbe. .TP -.B -o [0-5] +.B -o [0-6] A kimenet színterének (colorspace) kiválasztása, ha a .B -p opció nincs megadva: @@ -195,6 +195,9 @@ .br .B \t5 \ \ XYZ +.br +.B \t6 +\ \ ACES .TP .BR -p\ fényképezőgép.icm \ [\ -o\ kimenet.icm \ ] ICC profilok használata a fényképezőgép nyers (RAW) színterének (colorspace) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_hu.po new/dcraw/dcraw_hu.po --- old/dcraw/dcraw_hu.po 2011-07-23 23:55:41.000000000 +0200 +++ new/dcraw/dcraw_hu.po 2016-05-10 23:21:16.000000000 +0200 @@ -186,8 +186,8 @@ msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" msgstr "-t [0-7] Kép forgatása (0=nincs, 3=180, 5=90balra, 6=90jobbra)" -msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" -msgstr "-o [0-5] Kimenet színtere (nyers,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgid "-o [0-6] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" +msgstr "-o [0-6] Kimenet színtere (nyers,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" msgid "-o <file> Apply output ICC profile from file" msgstr "-o <fájl> Kimeneti ICC-profil alkalmazása fájlból" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_it.1 new/dcraw/dcraw_it.1 --- old/dcraw/dcraw_it.1 2009-05-14 23:15:59.000000000 +0200 +++ new/dcraw/dcraw_it.1 2016-05-10 23:21:13.000000000 +0200 @@ -140,7 +140,7 @@ .BR -M . Quest'opzione ha effetto solo sulle fotocamere Olympus, Leaf, e Phase One. .TP -.B -o [0-5] +.B -o [0-6] Seleziona lo spazio di colore in uscita, quando l'opzione .B -p non è usata: @@ -162,6 +162,9 @@ .br .B \t5 \ \ XYZ +.br +.B \t6 +\ \ ACES .TP .BR -p\ fotocamera.icm \ [\ -o\ output.icm \ ] Usa i profili ICC per definire lo spazio colore grezzo della diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_it.po new/dcraw/dcraw_it.po --- old/dcraw/dcraw_it.po 2011-07-23 23:55:41.000000000 +0200 +++ new/dcraw/dcraw_it.po 2016-05-10 23:21:16.000000000 +0200 @@ -215,8 +215,8 @@ msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" msgstr "-t [0-7] Ruota l'immagine (0=nessuna rotazione, 3=180°, 5=90° in senso anti orario, 6=90° in senso orario)" -msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" -msgstr "-o [0-5] Spazio colore in uscita (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgid "-o [0-6] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" +msgstr "-o [0-6] Spazio colore in uscita (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" msgid "-o <file> Apply output ICC profile from file" msgstr "-o <file> Converte ad un profilo ICC di output specificato da un file" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_ja.1 new/dcraw/dcraw_ja.1 --- old/dcraw/dcraw_ja.1 2015-04-06 22:46:09.000000000 +0200 +++ new/dcraw/dcraw_ja.1 2016-05-10 23:21:13.000000000 +0200 @@ -148,7 +148,7 @@ となる。DNG 以外の場合、 このオプションは Olympus, Leaf, Phase One のカメラでのみ有効である。 .TP -.B -o [0-5] +.B -o [0-6] .B -p オプションを用いない場合の出力色空間を選択する: @@ -169,6 +169,9 @@ .br .B \t5 \ \ XYZ +.br +.B \t6 +\ \ ACES .TP .BR -p\ camera.icm \ [\ -o\ output.icm \ ] ICC プロファイルを用いることでカメラの raw 色空間と diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_ja.po new/dcraw/dcraw_ja.po --- old/dcraw/dcraw_ja.po 2015-04-06 22:41:44.000000000 +0200 +++ new/dcraw/dcraw_ja.po 2016-05-10 23:21:16.000000000 +0200 @@ -187,8 +187,8 @@ msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" msgstr "-t [0-7] 画像を回転する (0=なし, 3=180度, 5=時計回りに90度, 6=反時計回りに90度)" -msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" -msgstr "-o [0-5] 出力先の色空間 (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgid "-o [0-6] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" +msgstr "-o [0-6] 出力先の色空間 (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" msgid "-o <file> Apply output ICC profile from file" msgstr "-o <ファイル> ファイルの出力 ICC プロファイルを適用する" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_nl.1 new/dcraw/dcraw_nl.1 --- old/dcraw/dcraw_nl.1 2015-03-03 23:10:23.000000000 +0100 +++ new/dcraw/dcraw_nl.1 2016-05-10 23:21:13.000000000 +0200 @@ -145,7 +145,7 @@ als dat niet het geval is. Deze optie heeft naast DNG-bestanden alleen betrekking op Olympus, Leaf, en Phase One camera's. .TP -.B -o [0-5] +.B -o [0-6] Kies de kleurruimte voor de uitvoer als de .B -p optie niet gebruikt wordt: @@ -167,6 +167,9 @@ .br .B \t5 \ \ XYZ +.br +.B \t6 +\ \ ACES .TP .BR -p\ camera.icm \ [\ -o\ uitvoer.icm \ ] Gebruik ICC profielen om de kleurruimtes van camera en uitvoer te diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_nl.po new/dcraw/dcraw_nl.po --- old/dcraw/dcraw_nl.po 2015-03-03 23:29:03.000000000 +0100 +++ new/dcraw/dcraw_nl.po 2016-05-10 23:21:16.000000000 +0200 @@ -217,8 +217,8 @@ msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" msgstr "-t [0-7] Draai afbeelding (0=niet, 3=180, 5=90klok-tegen, 6=90klok-mee)" -msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" -msgstr "-o [0-5] Uitvoer kleurruimte (RAW,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgid "-o [0-6] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" +msgstr "-o [0-6] Uitvoer kleurruimte (RAW,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" msgid "-o <file> Apply output ICC profile from file" msgstr "-o <file> Pas ICC-profiel van bestand toe op uitvoer" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_pl.1 new/dcraw/dcraw_pl.1 --- old/dcraw/dcraw_pl.1 2009-07-04 23:22:43.000000000 +0200 +++ new/dcraw/dcraw_pl.1 2016-05-10 23:21:13.000000000 +0200 @@ -144,7 +144,7 @@ w przeciwnym wypadku. Ta opcja dotyczy jedynie aparatów Olympus, Leaf oraz Phase One. .TP -.B -o [0-5] +.B -o [0-6] Wybierz wynikową przestrzeń kolorów, w przypadku gdy nie użyto parametru .B -p : @@ -166,6 +166,9 @@ .br .B \t5 \ \ XYZ +.br +.B \t6 +\ \ ACES .TP .BR -p\ aparat.icm \ [\ -o\ rezultat.icm \ ] Użyj profilów kolorów ICC do obliczenia surowej przestrzeni kolorów diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_pl.po new/dcraw/dcraw_pl.po --- old/dcraw/dcraw_pl.po 2011-07-23 23:55:41.000000000 +0200 +++ new/dcraw/dcraw_pl.po 2016-05-10 23:21:16.000000000 +0200 @@ -204,8 +204,8 @@ msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" msgstr "-t [0-7] Obróć obrazek (0=brak, 3=180, 5=90 w lewo, 6=90 w prawo)" -msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" -msgstr "-o [0-5] Wyjściowa przestrzeń kolorów (surowa,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgid "-o [0-6] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" +msgstr "-o [0-6] Wyjściowa przestrzeń kolorów (surowa,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" msgid "-o <file> Apply output ICC profile from file" msgstr "-o <plik> Zastosuj profil wyjściowy ICC z pliku" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_pt.1 new/dcraw/dcraw_pt.1 --- old/dcraw/dcraw_pt.1 2009-05-14 23:01:44.000000000 +0200 +++ new/dcraw/dcraw_pt.1 2016-05-10 23:21:13.000000000 +0200 @@ -140,7 +140,7 @@ caso contrário. Esta opção afeta somente câmeras Olympus, Leaf e Phase One. .TP -.B -o [0-5] +.B -o [0-6] Selecione o espaço de cor de saída quando a opção .B -p não for usada: @@ -162,6 +162,9 @@ .br .B \t5 \ \ XYZ +.br +.B \t6 +\ \ ACES .TP .BR -p\ camera.icm \ [\ -o\ output.icm \ ] Usa perfis ICC para definir o espaço de cor crua da câmera, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_pt.po new/dcraw/dcraw_pt.po --- old/dcraw/dcraw_pt.po 2011-07-23 23:55:41.000000000 +0200 +++ new/dcraw/dcraw_pt.po 2016-05-10 23:21:16.000000000 +0200 @@ -212,8 +212,8 @@ msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" msgstr "-t [0-7] Rotaciona a imagem (0=nada, 3=180, 5=90AH, 6=90H)" -msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" -msgstr "-o [0-5] Espaço de cor de saída (cru,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgid "-o [0-6] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" +msgstr "-o [0-6] Espaço de cor de saída (cru,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" msgid "-o <file> Apply output ICC profile from file" msgstr "-o <arq> Aplica o perfil ICC de saída deste arquivo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_ro.1 new/dcraw/dcraw_ro.1 --- old/dcraw/dcraw_ro.1 2015-02-18 04:36:40.000000000 +0100 +++ new/dcraw/dcraw_ro.1 2016-05-10 23:21:13.000000000 +0200 @@ -143,7 +143,7 @@ altfel. Această opţiune afectează doar camerele Olympus, Leaf, şi Phase One. .TP -.B -o [0-5] +.B -o [0-6] Selectează spaţiul de culoare de ieşire atunci cînd .B -p opţiunea nu este folosită: @@ -165,6 +165,9 @@ .br .B \t5 \ \ XYZ +.br +.B \t6 +\ \ ACES .TP .BR -p\ camera.icm \ [\ -o\ ieşire.icm \ ] Foloseşte profilele ICC pentru a defini spaţiul de culoare raw al camerei şi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_ro.po new/dcraw/dcraw_ro.po --- old/dcraw/dcraw_ro.po 2015-02-18 04:33:14.000000000 +0100 +++ new/dcraw/dcraw_ro.po 2016-05-10 23:21:16.000000000 +0200 @@ -194,8 +194,8 @@ msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" msgstr "-t [0-7] Întoarcere imagine (0=niciuna, 3=180, 5=90 grade la stînga, 6=90 grade la dreapta)" -msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" -msgstr "-o [0-5] Spaţiu de culoare de ieşire (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgid "-o [0-6] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" +msgstr "-o [0-6] Spaţiu de culoare de ieşire (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" msgid "-o <file> Apply output ICC profile from file" msgstr "-o <fişier> Aplică profil de ieşire ICC din fişier" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_ru.1 new/dcraw/dcraw_ru.1 --- old/dcraw/dcraw_ru.1 2009-05-14 23:51:30.000000000 +0200 +++ new/dcraw/dcraw_ru.1 2016-05-10 23:49:51.000000000 +0200 @@ -147,30 +147,33 @@ .BR -M . Эта опция влияет только на камеры Olympus, Leaf и Phase One. .TP -.B -o [0-5] +.B -o [0-6] Позволяет выбрать выходное цветовое пространство, при использовании опции .B -p : -.B 0 +.B \t0 \ \ Вывод в собственном цветовом пространстве камеры (уникально для каждой фотокамеры) .br -.B 1 +.B \t1 \ \ sRGB D65 (по умолчанию) .br -.B 2 +.B \t2 \ \ Adobe RGB (1998) D65 .br -.B 3 +.B \t3 \ \ Wide Gamut RGB D65 .br -.B 4 +.B \t4 \ \ Kodak ProPhoto RGB D65 .br -.B 5 +.B \t5 \ \ XYZ +.br +.B \t6 +\ \ ACES .TP .BR -p\ фотокамера.icm \ [\ -o\ вывод.icm \ ] Использует ICC профили для задания собственного цветового diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_ru.po new/dcraw/dcraw_ru.po --- old/dcraw/dcraw_ru.po 2011-07-23 23:55:41.000000000 +0200 +++ new/dcraw/dcraw_ru.po 2016-05-10 23:21:16.000000000 +0200 @@ -214,8 +214,8 @@ msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" msgstr "-t [0-7] Поворот изображения (0=нет, 3=180, 5=90 влево, 6=90 вправо)" -msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" -msgstr "-o [0-5] Выводимое цветовое пространство (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgid "-o [0-6] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" +msgstr "-o [0-6] Выводимое цветовое пространство (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" msgid "-o <file> Apply output ICC profile from file" msgstr "-o <файл> Использование выводимого ICC профиля из файла" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_sv.1 new/dcraw/dcraw_sv.1 --- old/dcraw/dcraw_sv.1 2009-05-14 23:10:26.000000000 +0200 +++ new/dcraw/dcraw_sv.1 2016-05-10 23:21:13.000000000 +0200 @@ -137,7 +137,7 @@ .BR -M . Detta val påverkar bara Olympus-, Leaf-, och Phase One-kameror. .TP -.B -o [0-5] +.B -o [0-6] Välj utdatats färgrymd när valet .B -p inte används: @@ -159,6 +159,9 @@ .br .B \t5 \ \ XYZ +.br +.B \t6 +\ \ ACES .TP .BR -p\ kamera.icm \ [\ -o\ utdata.icm \ ] Använd ICC-profiler för att definiera kamerans råa färgrymd och den diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_sv.po new/dcraw/dcraw_sv.po --- old/dcraw/dcraw_sv.po 2011-07-23 23:55:41.000000000 +0200 +++ new/dcraw/dcraw_sv.po 2016-05-10 23:21:16.000000000 +0200 @@ -181,8 +181,8 @@ msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" msgstr "-t [0-7] Vrid bilden (0=inget, 3=180°, 5=90° moturs, 6=90° medurs)" -msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" -msgstr "-o [0-5] Färgrymd för utdata (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgid "-o [0-6] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" +msgstr "-o [0-6] Färgrymd för utdata (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" msgid "-o <file> Apply output ICC profile from file" msgstr "-o <fil> Applicera ICC-profil från fil på utdata" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_zh_CN.1 new/dcraw/dcraw_zh_CN.1 --- old/dcraw/dcraw_zh_CN.1 2009-03-03 22:20:50.000000000 +0100 +++ new/dcraw/dcraw_zh_CN.1 2016-05-10 23:21:13.000000000 +0200 @@ -132,7 +132,7 @@ .B -M 这个参数只会影响 Olympus、Leaf 以及 Phase One 等品牌相机所拍摄的照片。 .TP -.B -o [0-5] +.B -o [0-6] 选定当 .B -p 选项没有使用时所输出的色域： @@ -154,6 +154,9 @@ .br .B \t5 \ \ XYZ +.br +.B \t6 +\ \ ACES .TP .BR -p\ camera.icm \ [\ -o\ output.icm \ ] 利用 ICC 描述档案来定义相机的输入以及输出 colorspace。(预设的 profile 值为 sRGB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_zh_CN.po new/dcraw/dcraw_zh_CN.po --- old/dcraw/dcraw_zh_CN.po 2011-07-23 23:55:41.000000000 +0200 +++ new/dcraw/dcraw_zh_CN.po 2016-05-10 23:21:16.000000000 +0200 @@ -208,8 +208,8 @@ msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" msgstr "-t [0-7] 翻转影像 (0：不翻转，3：转 180 度，5：逆时针转 90 度， 6：顺时针转 90 度)" -msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" -msgstr "-o [0-5] 输出 colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgid "-o [0-6] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" +msgstr "-o [0-6] 输出 colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" msgid "-o <file> Apply output ICC profile from file" msgstr "-o <档案路径> 读取相机 ICC 描述档案" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_zh_TW.1 new/dcraw/dcraw_zh_TW.1 --- old/dcraw/dcraw_zh_TW.1 2009-03-03 21:09:36.000000000 +0100 +++ new/dcraw/dcraw_zh_TW.1 2016-05-10 23:21:13.000000000 +0200 @@ -132,7 +132,7 @@ .B -M 這個參數只會影響 Olympus、Leaf 以及 Phase One 等品牌相機所拍攝的照片。 .TP -.B -o [0-5] +.B -o [0-6] 選定當 .B -p 選項沒有使用時所輸出的色域： @@ -154,6 +154,9 @@ .br .B \t5 \ \ XYZ +.br +.B \t6 +\ \ ACES .TP .BR -p\ camera.icm \ [\ -o\ output.icm \ ] 利用 ICC 描述檔案來定義相機的輸入以及輸出 colorspace。(預設的 profile 值為 sRGB) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dcraw/dcraw_zh_TW.po new/dcraw/dcraw_zh_TW.po --- old/dcraw/dcraw_zh_TW.po 2011-07-23 23:55:41.000000000 +0200 +++ new/dcraw/dcraw_zh_TW.po 2016-05-10 23:21:16.000000000 +0200 @@ -208,8 +208,8 @@ msgid "-t [0-7] Flip image (0=none, 3=180, 5=90CCW, 6=90CW)" msgstr "-t [0-7] 翻轉影像 (0：不翻轉，3：轉 180 度，5：逆時針轉 90 度， 6：順時針轉 90 度)" -msgid "-o [0-5] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" -msgstr "-o [0-5] 輸出 colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ)" +msgid "-o [0-6] Output colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" +msgstr "-o [0-6] 輸出 colorspace (raw,sRGB,Adobe,Wide,ProPhoto,XYZ,ACES)" msgid "-o <file> Apply output ICC profile from file" msgstr "-o <檔案路徑> 讀取相機 ICC 描述檔案"
