TGA & Endianness

2 files changed, 43 insertions, 35 deletions

diff --git a/lib/Image.cc b/lib/Image.cc
index 9b41b4e..0848e8b 100644
--- a/lib/Image.cc
+++ b/lib/Image.cc
@@ -39,6 +39,10 @@ void Image::SetPixel(unsigned int px, unsigned int py, Color c) {
     img[x * py + px] = c;
 }
 
+#ifndef WORDS_BIGENDIAN
+#define WORDS_BIGENDIAN 0
+#endif
+
 bool Image::Prepare(unsigned int f) {
     if (GetSize()) return false;
     
@@ -55,8 +59,8 @@ bool Image::Prepare(unsigned int f) {
 	    Header.CM_EntrySize = 0;
 	    Header.IS_XOrigin = 0;
 	    Header.IS_YOrigin = 0;
-	    Header.IS_Width = x;
-	    Header.IS_Height = y;
+	    Header.IS_Width = WORDS_BIGENDIAN ? ((x & 0xff) << 8) || ((x & 0xff00) >> 8) : x;
+	    Header.IS_Height = WORDS_BIGENDIAN ? ((y & 0xff) << 8) || ((y & 0xff00) >> 8) : y;
 	    Header.IS_Depth = 32;
 	    Header.IS_Descriptor = 0x20;
 
diff --git a/po/fr.po b/po/fr.po
index a3e487f..45d3260 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Baltisot 1.0.0\n"
-"POT-Creation-Date: 2001-12-05 23:52+0100\n"
+"POT-Creation-Date: 2002-01-08 10:14+0100\n"
 "PO-Revision-Date: 2001-10-29 08:26GMT\n"
 "Last-Translator: Nicolas Noble <nicolas@nobis-crew.org>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -14,11 +14,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.8\n"
 
-#: lib/CopyJob.cc:55
+#: lib/CopyJob.cc:68
 msgid "CopyJob from "
 msgstr "CopyJob depuis "
 
-#: lib/CopyJob.cc:55 lib/ReadJob.cc:48
+#: lib/CopyJob.cc:68 lib/ReadJob.cc:48
 msgid " to "
 msgstr " vers "
 
@@ -60,39 +60,40 @@ msgstr "Erreur en créant un tube: "
 msgid "Was not able to fork().\n"
 msgstr "N'a pu faire de fork().\n"
 
-#: lib/Handle.cc:147 lib/Handle.cc:155
+#: lib/Handle.cc:154 lib/Handle.cc:162
 #, fuzzy
 msgid "Error during close: "
 msgstr "Erreur pendant poll: "
 
-#: lib/Handle.cc:149
+#: lib/Handle.cc:156
 msgid "Error in zlib during gzclose."
 msgstr ""
 
-#: lib/Handle.cc:174
+#: lib/Handle.cc:181
 msgid "Bare Handle - should not happend"
 msgstr "Handle pur - ne devrait pas arriver"
 
-#: lib/Handle.cc:198
+#: lib/Handle.cc:205
 msgid "Can't SetZ a Handle twice."
 msgstr ""
 
-#: lib/Handle.cc:202
+#: lib/Handle.cc:208
 msgid "Can't SetZ a virtual Handle."
 msgstr ""
 
-#: lib/Handle.cc:217
+#: lib/Handle.cc:223
 #, fuzzy
 msgid "Was not able to gzdopen."
 msgstr "N'a pu faire de fork().\n"
 
-#: lib/Handle.cc:232
+#: lib/Handle.cc:239
 #, fuzzy
 msgid "Error in zlib during gzwrite: "
 msgstr "Erreur pendant poll: "
 
 #: lib/Input.cc:16 lib/Output.cc:16
-msgid "Error opening file"
+#, fuzzy
+msgid "Error opening file "
 msgstr "Erreur en ouvrant le fichier"
 
 #: lib/Input.cc:16
@@ -127,7 +128,7 @@ msgstr "Erreur en créeant un socket."
 msgid "Failed accepting."
 msgstr "N'a pu accepter."
 
-#: lib/Task.cc:28
+#: lib/Task.cc:28 lib/Task.cc:44
 msgid "Task "
 msgstr "La tache "
 
@@ -135,48 +136,42 @@ msgstr "La tache "
 msgid " caused an unexpected exception: \""
 msgstr " a causée une exception innatendue: \""
 
-#: lib/Task.cc:28
+#: lib/Task.cc:28 lib/Task.cc:44
 msgid "\". Terminating.\n"
 msgstr "\". Terminaison.\n"
 
-#: lib/Task.cc:40
+#: lib/Task.cc:44
+#, fuzzy
+msgid " caused an unexpected exception during dry-run: \""
+msgstr " a causée une exception innatendue: \""
+
+#: lib/Task.cc:57
 msgid "Unknow Task"
 msgstr "Tache inconnue"
 
-#: lib/TaskMan.cc:58
+#: lib/TaskMan.cc:68
 msgid "Task Manager already initialised."
 msgstr "Le gestionnaire de tache est déjà initialisé."
 
-#: lib/TaskMan.cc:145
+#: lib/TaskMan.cc:205
 msgid "TaskMan: No more task to manage."
 msgstr "Plus de taches à gérer."
 
-#: lib/TaskMan.cc:239
+#: lib/TaskMan.cc:316
 msgid "Error during poll: "
 msgstr "Erreur pendant poll: "
 
-#: lib/TaskMan.cc:250
+#: lib/TaskMan.cc:329
 msgid "Error with poll, handle "
 msgstr "Erreur avec poll, handle "
 
-#: lib/TaskMan.cc:250
+#: lib/TaskMan.cc:329
 msgid " invalid."
 msgstr " invalide."
 
-#: lib/TaskMan.cc:254
-msgid "Error condition with poll, handle "
-msgstr "Condition d'erreur avec poll, handle "
-
-#: lib/TaskMan.cc:258
-msgid "Handle "
-msgstr "Le handle "
-
-#: lib/TaskMan.cc:258
-msgid " hung up.\n"
-msgstr " a raccroché.\n"
-
-#: lib/TaskMan.cc:329
-msgid "TaskMan: internal error (task not found)"
+#: lib/TaskMan.cc:414
+#, fuzzy
+msgid "TaskMan: internal error (task not found) -- SHOULD NOT HAPPEN!!"
 msgstr "TaskMan: erreur interne (tache non trouvée)"
 
 #: lib/InPipe.cc:32
@@ -190,3 +185,12 @@ msgstr "non "
 #: lib/InPipe.cc:32 lib/OutPipe.cc:32
 msgid "hooked)"
 msgstr "détourné)"
+
+#~ msgid "Error condition with poll, handle "
+#~ msgstr "Condition d'erreur avec poll, handle "
+
+#~ msgid "Handle "
+#~ msgstr "Le handle "
+
+#~ msgid " hung up.\n"
+#~ msgstr " a raccroché.\n"