Fixed version number calculations, disabled headerOnly and dataOnly options
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6474 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -145,8 +145,9 @@ SGITranslator::SGITranslator()
|
|||||||
|
|
||||||
strcpy(fName, "SGI Images");
|
strcpy(fName, "SGI Images");
|
||||||
sprintf(fInfo, "SGI image translator v%d.%d.%d %s",
|
sprintf(fInfo, "SGI image translator v%d.%d.%d %s",
|
||||||
SGI_TRANSLATOR_VERSION / 100, (SGI_TRANSLATOR_VERSION / 10) % 10,
|
static_cast<int>(SGI_TRANSLATOR_VERSION >> 8),
|
||||||
SGI_TRANSLATOR_VERSION % 10, __DATE__);
|
static_cast<int>((SGI_TRANSLATOR_VERSION >> 4) & 0xf),
|
||||||
|
static_cast<int>(SGI_TRANSLATOR_VERSION & 0xf), __DATE__);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------
|
// ---------------------------------------------------------------
|
||||||
@@ -501,9 +502,7 @@ translate_from_bits(BPositionIO *inSource, ssize_t amtread, uint8 *read,
|
|||||||
{
|
{
|
||||||
TranslatorBitmap bitsHeader;
|
TranslatorBitmap bitsHeader;
|
||||||
|
|
||||||
// TODO: how do I comply with these requests for SGIImage?!?
|
bool bheaderonly = false, bdataonly = false;
|
||||||
bool bheaderonly = settings.SetGetHeaderOnly();
|
|
||||||
bool bdataonly = settings.SetGetDataOnly();
|
|
||||||
uint32 compression = settings.SetGetCompression();
|
uint32 compression = settings.SetGetCompression();
|
||||||
|
|
||||||
status_t ret = identify_bits_header(inSource, NULL, amtread, read, &bitsHeader);
|
status_t ret = identify_bits_header(inSource, NULL, amtread, read, &bitsHeader);
|
||||||
@@ -725,8 +724,7 @@ translate_from_sgi(BPositionIO *inSource, BMessage *ioExtension,
|
|||||||
|
|
||||||
if (ret >= B_OK) {
|
if (ret >= B_OK) {
|
||||||
|
|
||||||
bool bheaderonly = settings.SetGetHeaderOnly();
|
bool bheaderonly = false, bdataonly = false;
|
||||||
bool bdataonly = settings.SetGetDataOnly();
|
|
||||||
|
|
||||||
uint32 width = sgiImage->Width();
|
uint32 width = sgiImage->Width();
|
||||||
uint32 height = sgiImage->Height();
|
uint32 height = sgiImage->Height();
|
||||||
|
|||||||
@@ -44,7 +44,7 @@
|
|||||||
#include <ByteOrder.h>
|
#include <ByteOrder.h>
|
||||||
#include <fs_attr.h>
|
#include <fs_attr.h>
|
||||||
|
|
||||||
#define SGI_TRANSLATOR_VERSION 100
|
#define SGI_TRANSLATOR_VERSION 0x100
|
||||||
|
|
||||||
#define SGI_IN_QUALITY 0.5
|
#define SGI_IN_QUALITY 0.5
|
||||||
#define SGI_IN_CAPABILITY 0.6
|
#define SGI_IN_CAPABILITY 0.6
|
||||||
|
|||||||
Reference in New Issue
Block a user