i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Reverted parts of r28370:

Browse Source 
- the check for compression when counting valid images was wrong, and
    broke all RAW formats that weren't using this compression.
  - COMPRESSION_PACKBITS was defined twice.
* Cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28374 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-10-30 09:29:14 +00:00
parent 1d43a131ea
commit 225c0ed641
2 changed files with 325 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/translators/raw/RAW.cpp
+320 -284
View File
File diff suppressed because it is too large Load Diff
src/add-ons/translators/raw/RAW.h
+5 -2
View File
@@ -8,11 +8,10 @@
#include "ReadHelper.h" #include "ReadHelper.h"
struct jhead; struct jhead;
struct tiff_tag; struct tiff_tag;
#define COMPRESSION_PACKBITS 32773
struct image_meta_info { struct image_meta_info {
char manufacturer[64]; char manufacturer[64];
@@ -52,6 +51,10 @@ struct image_data_info {
bool is_raw; bool is_raw;
}; };
#define COMPRESSION_PACKBITS 32773
/* Macintosh RLE */
typedef void (*monitor_hook)(const char* message, float percentage, void* data); typedef void (*monitor_hook)(const char* message, float percentage, void* data);
class DCRaw { class DCRaw {