From 0e292355ba3134c77efff324883d2bd1a191f8d7 Mon Sep 17 00:00:00 2001 From: Matthew Wilber Date: Thu, 8 Jan 2004 03:41:53 +0000 Subject: [PATCH] Fixed version format and calculations git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5985 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/translators/libtifftranslator/TIFFTranslator.cpp | 5 +++-- src/add-ons/translators/libtifftranslator/TIFFTranslator.h | 2 +- src/add-ons/translators/libtifftranslator/TIFFView.cpp | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/add-ons/translators/libtifftranslator/TIFFTranslator.cpp b/src/add-ons/translators/libtifftranslator/TIFFTranslator.cpp index 96981b8afd..70f33dea3d 100644 --- a/src/add-ons/translators/libtifftranslator/TIFFTranslator.cpp +++ b/src/add-ons/translators/libtifftranslator/TIFFTranslator.cpp @@ -181,8 +181,9 @@ TIFFTranslator::TIFFTranslator() { strcpy(fName, "TIFF Images"); sprintf(fInfo, "TIFF image translator v%d.%d.%d %s", - TIFF_TRANSLATOR_VERSION / 100, (TIFF_TRANSLATOR_VERSION / 10) % 10, - TIFF_TRANSLATOR_VERSION % 10, __DATE__); + static_cast(TIFF_TRANSLATOR_VERSION >> 8), + static_cast((TIFF_TRANSLATOR_VERSION >> 4) & 0xf), + static_cast(TIFF_TRANSLATOR_VERSION & 0xf), __DATE__); } // --------------------------------------------------------------- diff --git a/src/add-ons/translators/libtifftranslator/TIFFTranslator.h b/src/add-ons/translators/libtifftranslator/TIFFTranslator.h index 91ea586736..2ba9115ba3 100644 --- a/src/add-ons/translators/libtifftranslator/TIFFTranslator.h +++ b/src/add-ons/translators/libtifftranslator/TIFFTranslator.h @@ -46,7 +46,7 @@ #define DOCUMENT_COUNT "/documentCount" #define DOCUMENT_INDEX "/documentIndex" -#define TIFF_TRANSLATOR_VERSION 100 +#define TIFF_TRANSLATOR_VERSION 0x100 #define TIFF_IN_QUALITY 0.5 #define TIFF_IN_CAPABILITY 0.6 diff --git a/src/add-ons/translators/libtifftranslator/TIFFView.cpp b/src/add-ons/translators/libtifftranslator/TIFFView.cpp index 3fa831254a..798d465d38 100644 --- a/src/add-ons/translators/libtifftranslator/TIFFView.cpp +++ b/src/add-ons/translators/libtifftranslator/TIFFView.cpp @@ -105,8 +105,9 @@ TIFFView::Draw(BRect area) char detail[100]; sprintf(detail, "Version %d.%d.%d %s", - TIFF_TRANSLATOR_VERSION / 100, (TIFF_TRANSLATOR_VERSION / 10) % 10, - TIFF_TRANSLATOR_VERSION % 10, __DATE__); + static_cast(TIFF_TRANSLATOR_VERSION >> 8), + static_cast((TIFF_TRANSLATOR_VERSION >> 4) & 0xf), + static_cast(TIFF_TRANSLATOR_VERSION & 0xf), __DATE__); DrawString(detail, BPoint(xbold, yplain + ybold)); int32 lineno = 4;