From bc94c4be2e7e37f1f3e8892dc115e61ed6b640e7 Mon Sep 17 00:00:00 2001
From: manuel <manuel@nc8430.lan>
Date: Sat, 2 May 2009 18:57:22 +0200
Subject: corrected cpixelformat constructor added classdiagramm

---
 ue2/doxygen.conf                        |   4 ++--
 ue2/imgsynth2/cpixelformat_indexed8.cpp |   1 +
 ue2/imgsynth2/cpixelformat_indexed8.h   |   7 +++----
 ue2/imgsynth2/cpixmap.h                 |   6 +++---
 ue2/protokoll/imgsynth.vpp              | Bin 53886 -> 0 bytes
 ue2/protokoll/imgsynth2.png             | Bin 0 -> 115909 bytes
 ue2/protokoll/imgsynth2.vpp             | Bin 0 -> 77276 bytes
 ue2/protokoll/protokoll.tex             |   6 ++++--
 8 files changed, 13 insertions(+), 11 deletions(-)
 delete mode 100644 ue2/protokoll/imgsynth.vpp
 create mode 100644 ue2/protokoll/imgsynth2.png
 create mode 100644 ue2/protokoll/imgsynth2.vpp

diff --git a/ue2/doxygen.conf b/ue2/doxygen.conf
index 4ea8eec..8c3801c 100644
--- a/ue2/doxygen.conf
+++ b/ue2/doxygen.conf
@@ -25,7 +25,7 @@ DOXYFILE_ENCODING      = UTF-8
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = imgsynth
+PROJECT_NAME           = imgsynth2
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. 
 # This could be handy for archiving the generated documentation or 
@@ -482,7 +482,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = imgsynth
+INPUT                  = imgsynth2
 
 # This tag can be used to specify the character encoding of the source files that 
 # doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default 
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 @@
 #include <boost/numeric/conversion/cast.hpp>
 #include <assert.h>
 #include "cpixelformat_indexed8.h"
+#include "cbitmap.h"
 
 using namespace std;
 
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 @@
 
 #include <fstream>
 #include "cpixelformat.h"
-#include "cpixmap.h"
 
 /**
  * @class CPixelFormat_Indexed8
@@ -24,14 +23,14 @@ class CPixelFormat_Indexed8 : public CPixelFormat
     /**
      * @method CPixelFormat_Indexed8
      * @brief  Default ctor
-     * @param  pixmap pointer to CPixmap instance
+     * @param  bitmap pointer to CBitmap instance
      * @return -
      * @globalvars none
      * @exception  none
      * @conditions none
      */
-    CPixelFormat_Indexed8(CPixmap *pixmap)
-      : CPixelFormat(pixmap)
+    CPixelFormat_Indexed8(CBitmap *bitmap)
+      : CPixelFormat(bitmap)
     {}
 
     /**
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
       uint32_t xHotspot;
       /** Y-Position Hotspots */
       uint32_t yHotspot;
-      /* is hotspot set */
+      /** is hotspot set */
       bool _HOTSPOT;
-      /* XPMEXT extension tag found*/
+      /** XPMEXT extension tag found*/
       bool _XPMEXT;
-      /* unchanged extension */
+      /** unchanged extension */
       std::string extension;
     } PIXMAP_FILEHEADER;
 
diff --git a/ue2/protokoll/imgsynth.vpp b/ue2/protokoll/imgsynth.vpp
deleted file mode 100644
index b94b9e4..0000000
Binary files a/ue2/protokoll/imgsynth.vpp and /dev/null differ
diff --git a/ue2/protokoll/imgsynth2.png b/ue2/protokoll/imgsynth2.png
new file mode 100644
index 0000000..83797ba
Binary files /dev/null and b/ue2/protokoll/imgsynth2.png differ
diff --git a/ue2/protokoll/imgsynth2.vpp b/ue2/protokoll/imgsynth2.vpp
new file mode 100644
index 0000000..e00e709
Binary files /dev/null and b/ue2/protokoll/imgsynth2.vpp differ
diff --git a/ue2/protokoll/protokoll.tex b/ue2/protokoll/protokoll.tex
index 456a6e7..c9a6930 100644
--- a/ue2/protokoll/protokoll.tex
+++ b/ue2/protokoll/protokoll.tex
@@ -45,7 +45,7 @@ TODO
 %==================================================================
 \begin{figure}[htb]
 \begin{center}
-\epsfxsize=0.9\textwidth\epsfbox{ClassDiagram1.png}
+\epsfxsize=0.9\textwidth\epsfbox{imgsynth2.png}
 \end{center}
 \caption{Klassendiagramm 1} 
 \label{fig:classdiagram1}
@@ -83,7 +83,9 @@ TODO
   \toprule
   Entwicklungsschritt / Meilenstein & Arbeitsaufwand\\
   \midrule
-  TODO
+  TODO\\
+  \hline
+  TODO\\
   \bottomrule
 \end{tabular}
 
-- 
cgit v1.2.3