summaryrefslogtreecommitdiffstats
path: root/ue2/imgsynth2
diff options
context:
space:
mode:
authormanuel <manuel@nc8430.lan>2009-05-02 18:57:22 +0200
committermanuel <manuel@nc8430.lan>2009-05-02 18:57:22 +0200
commitbc94c4be2e7e37f1f3e8892dc115e61ed6b640e7 (patch)
treec43a11bfc36ebb6bbb506d17aad223a302d96765 /ue2/imgsynth2
parent5c4506a8c5ee1a82268146007619b09e980a7a57 (diff)
downloadooprog-bc94c4be2e7e37f1f3e8892dc115e61ed6b640e7.tar.gz
ooprog-bc94c4be2e7e37f1f3e8892dc115e61ed6b640e7.tar.bz2
ooprog-bc94c4be2e7e37f1f3e8892dc115e61ed6b640e7.zip
corrected cpixelformat constructor
added classdiagramm
Diffstat (limited to 'ue2/imgsynth2')
-rw-r--r--ue2/imgsynth2/cpixelformat_indexed8.cpp1
-rw-r--r--ue2/imgsynth2/cpixelformat_indexed8.h7
-rw-r--r--ue2/imgsynth2/cpixmap.h6
3 files changed, 7 insertions, 7 deletions
diff --git a/ue2/imgsynth2/cpixelformat_indexed8.cpp b/ue2/imgsynth2/cpixelformat_indexed8.cpp
index d92ae9f..b314f0a 100644
--- a/ue2/imgsynth2/cpixelformat_indexed8.cpp
+++ b/ue2/imgsynth2/cpixelformat_indexed8.cpp
@@ -8,6 +8,7 @@
8#include <boost/numeric/conversion/cast.hpp> 8#include <boost/numeric/conversion/cast.hpp>
9#include <assert.h> 9#include <assert.h>
10#include "cpixelformat_indexed8.h" 10#include "cpixelformat_indexed8.h"
11#include "cbitmap.h"
11 12
12using namespace std; 13using namespace std;
13 14
diff --git a/ue2/imgsynth2/cpixelformat_indexed8.h b/ue2/imgsynth2/cpixelformat_indexed8.h
index 331d423..ac18b87 100644
--- a/ue2/imgsynth2/cpixelformat_indexed8.h
+++ b/ue2/imgsynth2/cpixelformat_indexed8.h
@@ -10,7 +10,6 @@
10 10
11#include <fstream> 11#include <fstream>
12#include "cpixelformat.h" 12#include "cpixelformat.h"
13#include "cpixmap.h"
14 13
15/** 14/**
16 * @class CPixelFormat_Indexed8 15 * @class CPixelFormat_Indexed8
@@ -24,14 +23,14 @@ class CPixelFormat_Indexed8 : public CPixelFormat
24 /** 23 /**
25 * @method CPixelFormat_Indexed8 24 * @method CPixelFormat_Indexed8
26 * @brief Default ctor 25 * @brief Default ctor
27 * @param pixmap pointer to CPixmap instance 26 * @param bitmap pointer to CBitmap instance
28 * @return - 27 * @return -
29 * @globalvars none 28 * @globalvars none
30 * @exception none 29 * @exception none
31 * @conditions none 30 * @conditions none
32 */ 31 */
33 CPixelFormat_Indexed8(CPixmap *pixmap) 32 CPixelFormat_Indexed8(CBitmap *bitmap)
34 : CPixelFormat(pixmap) 33 : CPixelFormat(bitmap)
35 {} 34 {}
36 35
37 /** 36 /**
diff --git a/ue2/imgsynth2/cpixmap.h b/ue2/imgsynth2/cpixmap.h
index 10f2b33..5316987 100644
--- a/ue2/imgsynth2/cpixmap.h
+++ b/ue2/imgsynth2/cpixmap.h
@@ -214,11 +214,11 @@ class CPixmap : public CBitmap
214 uint32_t xHotspot; 214 uint32_t xHotspot;
215 /** Y-Position Hotspots */ 215 /** Y-Position Hotspots */
216 uint32_t yHotspot; 216 uint32_t yHotspot;
217 /* is hotspot set */ 217 /** is hotspot set */
218 bool _HOTSPOT; 218 bool _HOTSPOT;
219 /* XPMEXT extension tag found*/ 219 /** XPMEXT extension tag found*/
220 bool _XPMEXT; 220 bool _XPMEXT;
221 /* unchanged extension */ 221 /** unchanged extension */
222 std::string extension; 222 std::string extension;
223 } PIXMAP_FILEHEADER; 223 } PIXMAP_FILEHEADER;
224 224