Archives
Archives
| From: | "Daniel Black (dragonheart)" <dragonheart@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in app-admin/testdisk/files: testdisk-6.8-jpeg.patch digest-testdisk-6.9 testdisk-6.8-ntfsprogs2.patch testdisk-6.7-constdef.patch |
| Date: | Tue, 01 Apr 2008 23:54:28 |
| Message-Id: | E1JgqJ8-0002Lb-GO@stork.gentoo.org |
| 1 | dragonheart 08/04/01 23:54:26 |
| 2 | |
| 3 | Added: testdisk-6.8-jpeg.patch digest-testdisk-6.9 |
| 4 | Removed: testdisk-6.8-ntfsprogs2.patch |
| 5 | testdisk-6.7-constdef.patch |
| 6 | Log: |
| 7 | fixed compile of 6.8 with USE=-jpeg as per bug #201710 thanks to Florian Philipp for the bug report and Christophe GRENIER for the fix. Version bump to 6.9 as per bug #212094. + QA fixes |
| 8 | (Portage version: 2.1.4.4) |
| 9 | |
| 10 | Revision Changes Path |
| 11 | 1.1 app-admin/testdisk/files/testdisk-6.8-jpeg.patch |
| 12 | |
| 13 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/testdisk/files/testdisk-6.8-jpeg.patch?rev=1.1&view=markup |
| 14 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/testdisk/files/testdisk-6.8-jpeg.patch?rev=1.1&content-type=text/plain |
| 15 | |
| 16 | Index: testdisk-6.8-jpeg.patch |
| 17 | =================================================================== |
| 18 | --- testdisk-6.8/src/file_jpg.c 2007-07-17 23:44:07.000000000 +0200 |
| 19 | +++ testdisk-6.8.new/src/file_jpg.c 2007-12-23 13:39:56.000000000 +0100 |
| 20 | |
| 21 | @@ -394,18 +393,18 @@ |
| 22 | (void) jpeg_read_scanlines(&cinfo, buffer, 1); |
| 23 | } |
| 24 | (void) jpeg_finish_decompress(&cinfo); |
| 25 | - jpeg_destroy_decompress(&cinfo); |
| 26 | - } |
| 27 | -#endif |
| 28 | - /* Not accurate */ |
| 29 | -// jpeg_size=ftell(infile); |
| 30 | -// log_error("JPG offset %llu\n", (long long unsigned)jpeg_size); |
| 31 | { |
| 32 | my_source_mgr * src; |
| 33 | src = (my_source_mgr *) cinfo.src; |
| 34 | jpeg_size=src->file_size - src->pub.bytes_in_buffer; |
| 35 | -// log_error("JPG size: %llu\n", (long long unsigned)jpeg_size); |
| 36 | } |
| 37 | + jpeg_destroy_decompress(&cinfo); |
| 38 | + } |
| 39 | +#else |
| 40 | + /* Not accurate */ |
| 41 | + jpeg_size=ftell(infile); |
| 42 | +#endif |
| 43 | +// log_error("JPG size: %llu\n", (long long unsigned)jpeg_size); |
| 44 | if(jpeg_size<=0) |
| 45 | return; |
| 46 | #if defined(HAVE_LIBJPEG) && defined(HAVE_JPEGLIB_H) |
| 47 | |
| 48 | |
| 49 | |
| 50 | 1.1 app-admin/testdisk/files/digest-testdisk-6.9 |
| 51 | |
| 52 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/testdisk/files/digest-testdisk-6.9?rev=1.1&view=markup |
| 53 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/testdisk/files/digest-testdisk-6.9?rev=1.1&content-type=text/plain |
| 54 | |
| 55 | Index: digest-testdisk-6.9 |
| 56 | =================================================================== |
| 57 | MD5 fbe2117509700ab0e0cebe39b689da80 testdisk-6.9-WIP.tar.bz2 797878 |
| 58 | RMD160 34c5db642e1fb13e4baa461714f0268c94de6673 testdisk-6.9-WIP.tar.bz2 797878 |
| 59 | SHA256 a88d0bfd857ebc3bb6722248e23b539292a3e3b2e1c455092385e33217b81a21 testdisk-6.9-WIP.tar.bz2 797878 |
| 60 | |
| 61 | |
| 62 | |
| 63 | -- |
| 64 | gentoo-commits@l.g.o mailing list |