From deef293945e354d33f3e45c0386882fae89b4bed Mon Sep 17 00:00:00 2001 From: Matthew Wilber Date: Thu, 8 Jan 2004 03:54:17 +0000 Subject: [PATCH] Fixed version number format and calculations git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5987 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/translators/stxttranslator/STXTTranslator.cpp | 5 +++-- src/add-ons/translators/stxttranslator/STXTTranslator.h | 2 +- src/add-ons/translators/stxttranslator/STXTView.cpp | 5 +++-- src/add-ons/translators/tgatranslator/TGATranslator.cpp | 5 +++-- src/add-ons/translators/tgatranslator/TGATranslator.h | 2 +- src/add-ons/translators/tgatranslator/TGAView.cpp | 5 +++-- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/add-ons/translators/stxttranslator/STXTTranslator.cpp b/src/add-ons/translators/stxttranslator/STXTTranslator.cpp index 388effdc6a..bf35135c9c 100644 --- a/src/add-ons/translators/stxttranslator/STXTTranslator.cpp +++ b/src/add-ons/translators/stxttranslator/STXTTranslator.cpp @@ -130,8 +130,9 @@ STXTTranslator::STXTTranslator() { strcpy(fName, "StyledEdit Files"); sprintf(fInfo, "StyledEdit file translator v%d.%d.%d %s", - STXT_TRANSLATOR_VERSION / 100, (STXT_TRANSLATOR_VERSION / 10) % 10, - STXT_TRANSLATOR_VERSION % 10, __DATE__); + static_cast(STXT_TRANSLATOR_VERSION >> 8), + static_cast((STXT_TRANSLATOR_VERSION >> 4) & 0xf), + static_cast(STXT_TRANSLATOR_VERSION & 0xf), __DATE__); } // --------------------------------------------------------------- diff --git a/src/add-ons/translators/stxttranslator/STXTTranslator.h b/src/add-ons/translators/stxttranslator/STXTTranslator.h index 05f8cf8fe5..1a2e99aebd 100644 --- a/src/add-ons/translators/stxttranslator/STXTTranslator.h +++ b/src/add-ons/translators/stxttranslator/STXTTranslator.h @@ -42,7 +42,7 @@ #include #include -#define STXT_TRANSLATOR_VERSION 100 +#define STXT_TRANSLATOR_VERSION 0x100 #define STXT_IN_QUALITY 0.5 // high in quality becuase this code supports all STXT features #define STXT_IN_CAPABILITY 0.5 diff --git a/src/add-ons/translators/stxttranslator/STXTView.cpp b/src/add-ons/translators/stxttranslator/STXTView.cpp index f743fe1b43..144ac04a0b 100644 --- a/src/add-ons/translators/stxttranslator/STXTView.cpp +++ b/src/add-ons/translators/stxttranslator/STXTView.cpp @@ -104,8 +104,9 @@ STXTView::Draw(BRect area) char detail[100]; sprintf(detail, "Version %d.%d.%d %s", - STXT_TRANSLATOR_VERSION / 100, (STXT_TRANSLATOR_VERSION / 10) % 10, - STXT_TRANSLATOR_VERSION % 10, __DATE__); + static_cast(STXT_TRANSLATOR_VERSION >> 8), + static_cast((STXT_TRANSLATOR_VERSION >> 4) & 0xf), + static_cast(STXT_TRANSLATOR_VERSION & 0xf), __DATE__); DrawString(detail, BPoint(xbold, yplain + ybold)); /* char copyright[] = "© 2002 OpenBeOS Project"; DrawString(copyright, BPoint(xbold, yplain * 2 + ybold)); diff --git a/src/add-ons/translators/tgatranslator/TGATranslator.cpp b/src/add-ons/translators/tgatranslator/TGATranslator.cpp index 46d38dc7ba..024b97f89b 100644 --- a/src/add-ons/translators/tgatranslator/TGATranslator.cpp +++ b/src/add-ons/translators/tgatranslator/TGATranslator.cpp @@ -132,8 +132,9 @@ TGATranslator::TGATranslator() strcpy(fName, "TGA Images"); sprintf(fInfo, "TGA image translator v%d.%d.%d %s", - TGA_TRANSLATOR_VERSION / 100, (TGA_TRANSLATOR_VERSION / 10) % 10, - TGA_TRANSLATOR_VERSION % 10, __DATE__); + static_cast(TGA_TRANSLATOR_VERSION >> 8), + static_cast((TGA_TRANSLATOR_VERSION >> 4) & 0xf), + static_cast(TGA_TRANSLATOR_VERSION & 0xf), __DATE__); } // --------------------------------------------------------------- diff --git a/src/add-ons/translators/tgatranslator/TGATranslator.h b/src/add-ons/translators/tgatranslator/TGATranslator.h index 1ae27dcecc..e477856b88 100644 --- a/src/add-ons/translators/tgatranslator/TGATranslator.h +++ b/src/add-ons/translators/tgatranslator/TGATranslator.h @@ -40,7 +40,7 @@ #include #include "TGATranslatorSettings.h" -#define TGA_TRANSLATOR_VERSION 100 +#define TGA_TRANSLATOR_VERSION 0x100 #define TGA_IN_QUALITY 1.0 // high in quality becuase this code supports all TGA features #define TGA_IN_CAPABILITY 0.6 diff --git a/src/add-ons/translators/tgatranslator/TGAView.cpp b/src/add-ons/translators/tgatranslator/TGAView.cpp index 2ab0e96800..cedcb72f74 100644 --- a/src/add-ons/translators/tgatranslator/TGAView.cpp +++ b/src/add-ons/translators/tgatranslator/TGAView.cpp @@ -191,8 +191,9 @@ TGAView::Draw(BRect area) char detail[100]; sprintf(detail, "Version %d.%d.%d %s", - TGA_TRANSLATOR_VERSION / 100, (TGA_TRANSLATOR_VERSION / 10) % 10, - TGA_TRANSLATOR_VERSION % 10, __DATE__); + static_cast(TGA_TRANSLATOR_VERSION >> 8), + static_cast((TGA_TRANSLATOR_VERSION >> 4) & 0xf), + static_cast(TGA_TRANSLATOR_VERSION & 0xf), __DATE__); DrawString(detail, BPoint(xbold, yplain + ybold)); /* char copyright[] = "© 2002 OpenBeOS Project"; DrawString(copyright, BPoint(xbold, yplain * 2 + ybold));