Converted all bitmap.h images to pbm format and added a pbm load function to flow_browapi.

profibus/exe/profinet_viewer/src/pn_viewernav.cpp

@@ -45,39 +45,6 @@
 #include "co_string.h"
 #include "co_time.h"
 
-#include "xnav_bitmap_map8.h"
-#include "xnav_bitmap_map10.h"
-#include "xnav_bitmap_map12.h"
-#include "xnav_bitmap_map14.h"
-#include "xnav_bitmap_map16.h"
-#include "xnav_bitmap_map18.h"
-#include "xnav_bitmap_map20.h"
-#include "xnav_bitmap_map24.h"
-#include "xnav_bitmap_openmap8.h"
-#include "xnav_bitmap_openmap10.h"
-#include "xnav_bitmap_openmap12.h"
-#include "xnav_bitmap_openmap14.h"
-#include "xnav_bitmap_openmap16.h"
-#include "xnav_bitmap_openmap18.h"
-#include "xnav_bitmap_openmap20.h"
-#include "xnav_bitmap_openmap24.h"
-#include "xnav_bitmap_morehelp8.h"
-#include "xnav_bitmap_morehelp10.h"
-#include "xnav_bitmap_morehelp12.h"
-#include "xnav_bitmap_morehelp14.h"
-#include "xnav_bitmap_morehelp16.h"
-#include "xnav_bitmap_morehelp18.h"
-#include "xnav_bitmap_morehelp20.h"
-#include "xnav_bitmap_morehelp24.h"
-#include "xnav_bitmap_attr8.h"
-#include "xnav_bitmap_attr10.h"
-#include "xnav_bitmap_attr12.h"
-#include "xnav_bitmap_attr14.h"
-#include "xnav_bitmap_attr16.h"
-#include "xnav_bitmap_attr18.h"
-#include "xnav_bitmap_attr20.h"
-#include "xnav_bitmap_attr24.h"
-
 #include "pn_viewernav.h"
 #include "rt_pb_msg.h"
 
@@ -104,132 +71,10 @@ void PnViewerNavBrow::free_pixmaps()
 //
 void PnViewerNavBrow::allocate_pixmaps()
 {
-  flow_sPixmapData pixmap_data;
-  int i;
-
-  i = 0;
-  pixmap_data[i].width = xnav_bitmap_map8_width;
-  pixmap_data[i].height = xnav_bitmap_map8_height;
-  pixmap_data[i++].bits = xnav_bitmap_map8_bits;
-  pixmap_data[i].width = xnav_bitmap_map10_width;
-  pixmap_data[i].height = xnav_bitmap_map10_height;
-  pixmap_data[i++].bits = xnav_bitmap_map10_bits;
-  pixmap_data[i].width = xnav_bitmap_map12_width;
-  pixmap_data[i].height = xnav_bitmap_map12_height;
-  pixmap_data[i++].bits = xnav_bitmap_map12_bits;
-  pixmap_data[i].width = xnav_bitmap_map14_width;
-  pixmap_data[i].height = xnav_bitmap_map14_height;
-  pixmap_data[i++].bits = xnav_bitmap_map14_bits;
-  pixmap_data[i].width = xnav_bitmap_map16_width;
-  pixmap_data[i].height = xnav_bitmap_map16_height;
-  pixmap_data[i++].bits = xnav_bitmap_map16_bits;
-  pixmap_data[i].width = xnav_bitmap_map18_width;
-  pixmap_data[i].height = xnav_bitmap_map18_height;
-  pixmap_data[i++].bits = xnav_bitmap_map18_bits;
-  pixmap_data[i].width = xnav_bitmap_map20_width;
-  pixmap_data[i].height = xnav_bitmap_map20_height;
-  pixmap_data[i++].bits = xnav_bitmap_map20_bits;
-  pixmap_data[i].width = xnav_bitmap_map20_width;
-  pixmap_data[i].height = xnav_bitmap_map20_height;
-  pixmap_data[i++].bits = xnav_bitmap_map20_bits;
-  pixmap_data[i].width = xnav_bitmap_map24_width;
-  pixmap_data[i].height = xnav_bitmap_map24_height;
-  pixmap_data[i++].bits = xnav_bitmap_map24_bits;
-
-  brow_AllocAnnotPixmap(ctx, &pixmap_data, &pixmap_map);
-
-  i = 0;
-  pixmap_data[i].width = xnav_bitmap_openmap8_width;
-  pixmap_data[i].height = xnav_bitmap_openmap8_height;
-  pixmap_data[i++].bits = xnav_bitmap_openmap8_bits;
-  pixmap_data[i].width = xnav_bitmap_openmap10_width;
-  pixmap_data[i].height = xnav_bitmap_openmap10_height;
-  pixmap_data[i++].bits = xnav_bitmap_openmap10_bits;
-  pixmap_data[i].width = xnav_bitmap_openmap12_width;
-  pixmap_data[i].height = xnav_bitmap_openmap12_height;
-  pixmap_data[i++].bits = xnav_bitmap_openmap12_bits;
-  pixmap_data[i].width = xnav_bitmap_openmap14_width;
-  pixmap_data[i].height = xnav_bitmap_openmap14_height;
-  pixmap_data[i++].bits = xnav_bitmap_openmap14_bits;
-  pixmap_data[i].width = xnav_bitmap_openmap16_width;
-  pixmap_data[i].height = xnav_bitmap_openmap16_height;
-  pixmap_data[i++].bits = xnav_bitmap_openmap16_bits;
-  pixmap_data[i].width = xnav_bitmap_openmap18_width;
-  pixmap_data[i].height = xnav_bitmap_openmap18_height;
-  pixmap_data[i++].bits = xnav_bitmap_openmap18_bits;
-  pixmap_data[i].width = xnav_bitmap_openmap20_width;
-  pixmap_data[i].height = xnav_bitmap_openmap20_height;
-  pixmap_data[i++].bits = xnav_bitmap_openmap20_bits;
-  pixmap_data[i].width = xnav_bitmap_openmap20_width;
-  pixmap_data[i].height = xnav_bitmap_openmap20_height;
-  pixmap_data[i++].bits = xnav_bitmap_openmap20_bits;
-  pixmap_data[i].width = xnav_bitmap_openmap24_width;
-  pixmap_data[i].height = xnav_bitmap_openmap24_height;
-  pixmap_data[i++].bits = xnav_bitmap_openmap24_bits;
-
-  brow_AllocAnnotPixmap(ctx, &pixmap_data, &pixmap_openmap);
-
-  i = 0;
-  pixmap_data[i].width = xnav_bitmap_attr8_width;
-  pixmap_data[i].height = xnav_bitmap_attr8_height;
-  pixmap_data[i++].bits = xnav_bitmap_attr8_bits;
-  pixmap_data[i].width = xnav_bitmap_attr10_width;
-  pixmap_data[i].height = xnav_bitmap_attr10_height;
-  pixmap_data[i++].bits = xnav_bitmap_attr10_bits;
-  pixmap_data[i].width = xnav_bitmap_attr12_width;
-  pixmap_data[i].height = xnav_bitmap_attr12_height;
-  pixmap_data[i++].bits = xnav_bitmap_attr12_bits;
-  pixmap_data[i].width = xnav_bitmap_attr14_width;
-  pixmap_data[i].height = xnav_bitmap_attr14_height;
-  pixmap_data[i++].bits = xnav_bitmap_attr14_bits;
-  pixmap_data[i].width = xnav_bitmap_attr16_width;
-  pixmap_data[i].height = xnav_bitmap_attr16_height;
-  pixmap_data[i++].bits = xnav_bitmap_attr16_bits;
-  pixmap_data[i].width = xnav_bitmap_attr18_width;
-  pixmap_data[i].height = xnav_bitmap_attr18_height;
-  pixmap_data[i++].bits = xnav_bitmap_attr18_bits;
-  pixmap_data[i].width = xnav_bitmap_attr20_width;
-  pixmap_data[i].height = xnav_bitmap_attr20_height;
-  pixmap_data[i++].bits = xnav_bitmap_attr20_bits;
-  pixmap_data[i].width = xnav_bitmap_attr20_width;
-  pixmap_data[i].height = xnav_bitmap_attr20_height;
-  pixmap_data[i++].bits = xnav_bitmap_attr20_bits;
-  pixmap_data[i].width = xnav_bitmap_attr24_width;
-  pixmap_data[i].height = xnav_bitmap_attr24_height;
-  pixmap_data[i++].bits = xnav_bitmap_attr24_bits;
-
-  brow_AllocAnnotPixmap(ctx, &pixmap_data, &pixmap_attr);
-
-  i = 0;
-  pixmap_data[i].width = xnav_bitmap_morehelp8_width;
-  pixmap_data[i].height = xnav_bitmap_morehelp8_height;
-  pixmap_data[i++].bits = xnav_bitmap_morehelp8_bits;
-  pixmap_data[i].width = xnav_bitmap_morehelp10_width;
-  pixmap_data[i].height = xnav_bitmap_morehelp10_height;
-  pixmap_data[i++].bits = xnav_bitmap_morehelp10_bits;
-  pixmap_data[i].width = xnav_bitmap_morehelp12_width;
-  pixmap_data[i].height = xnav_bitmap_morehelp12_height;
-  pixmap_data[i++].bits = xnav_bitmap_morehelp12_bits;
-  pixmap_data[i].width = xnav_bitmap_morehelp14_width;
-  pixmap_data[i].height = xnav_bitmap_morehelp14_height;
-  pixmap_data[i++].bits = xnav_bitmap_morehelp14_bits;
-  pixmap_data[i].width = xnav_bitmap_morehelp16_width;
-  pixmap_data[i].height = xnav_bitmap_morehelp16_height;
-  pixmap_data[i++].bits = xnav_bitmap_morehelp16_bits;
-  pixmap_data[i].width = xnav_bitmap_morehelp18_width;
-  pixmap_data[i].height = xnav_bitmap_morehelp18_height;
-  pixmap_data[i++].bits = xnav_bitmap_morehelp18_bits;
-  pixmap_data[i].width = xnav_bitmap_morehelp20_width;
-  pixmap_data[i].height = xnav_bitmap_morehelp20_height;
-  pixmap_data[i++].bits = xnav_bitmap_morehelp20_bits;
-  pixmap_data[i].width = xnav_bitmap_morehelp20_width;
-  pixmap_data[i].height = xnav_bitmap_morehelp20_height;
-  pixmap_data[i++].bits = xnav_bitmap_morehelp20_bits;
-  pixmap_data[i].width = xnav_bitmap_morehelp24_width;
-  pixmap_data[i].height = xnav_bitmap_morehelp24_height;
-  pixmap_data[i++].bits = xnav_bitmap_morehelp24_bits;
-
-  brow_AllocAnnotPixmap(ctx, &pixmap_data, &pixmap_edit);
+  brow_LoadPBMs(ctx, "xnav_bitmap_map", &pixmap_map);
+  brow_LoadPBMs(ctx, "xnav_bitmap_openmap", &pixmap_openmap);
+  brow_LoadPBMs(ctx, "xnav_bitmap_attr", &pixmap_attr);
+  brow_LoadPBMs(ctx, "xnav_bitmap_morehelp", &pixmap_edit);
 }
 
 //

sev/exe/sev_xtt/src/xtt_tblnav.cpp

@@ -48,12 +48,6 @@
 
 #include "xtt_tblnav.h"
 
-#include "xnav_bitmap_leaf12.h"
-#include "xnav_bitmap_map12.h"
-#include "xnav_bitmap_openmap12.h"
-#include "xnav_bitmap_attr12.h"
-#include "xnav_bitmap_attrarra12.h"
-
 /*
 #define TBLNAV__INPUT_SYNTAX 2
 #define TBLNAV__OBJNOTFOUND 4
@@ -88,48 +82,11 @@ void TblNavBrow::free_pixmaps()
 //
 void TblNavBrow::allocate_pixmaps()
 {
-  flow_sPixmapData pixmap_data;
-  int i;
-
-  for (i = 0; i < 9; i++) {
-    pixmap_data[i].width = xnav_bitmap_leaf12_width;
-    pixmap_data[i].height = xnav_bitmap_leaf12_height;
-    pixmap_data[i].bits = xnav_bitmap_leaf12_bits;
-  }
-
-  brow_AllocAnnotPixmap(ctx, &pixmap_data, &pixmap_leaf);
-
-  for (i = 0; i < 9; i++) {
-    pixmap_data[i].width = xnav_bitmap_map12_width;
-    pixmap_data[i].height = xnav_bitmap_map12_height;
-    pixmap_data[i].bits = xnav_bitmap_map12_bits;
-  }
-
-  brow_AllocAnnotPixmap(ctx, &pixmap_data, &pixmap_map);
-
-  for (i = 0; i < 9; i++) {
-    pixmap_data[i].width = xnav_bitmap_openmap12_width;
-    pixmap_data[i].height = xnav_bitmap_openmap12_height;
-    pixmap_data[i].bits = xnav_bitmap_openmap12_bits;
-  }
-
-  brow_AllocAnnotPixmap(ctx, &pixmap_data, &pixmap_openmap);
-
-  for (i = 0; i < 9; i++) {
-    pixmap_data[i].width = xnav_bitmap_attr12_width;
-    pixmap_data[i].height = xnav_bitmap_attr12_height;
-    pixmap_data[i].bits = xnav_bitmap_attr12_bits;
-  }
-
-  brow_AllocAnnotPixmap(ctx, &pixmap_data, &pixmap_attr);
-
-  for (i = 0; i < 9; i++) {
-    pixmap_data[i].width = xnav_bitmap_attrarra12_width;
-    pixmap_data[i].height = xnav_bitmap_attrarra12_height;
-    pixmap_data[i].bits = xnav_bitmap_attrarra12_bits;
-  }
-
-  brow_AllocAnnotPixmap(ctx, &pixmap_data, &pixmap_attrarray);
+  brow_LoadPBM(ctx, "xnav_bitmap_leaf", &pixmap_leaf);
+  brow_LoadPBM(ctx, "xnav_bitmap_map", &pixmap_map);
+  brow_LoadPBM(ctx, "xnav_bitmap_openmap", &pixmap_openmap);
+  brow_LoadPBM(ctx, "xnav_bitmap_attr", &pixmap_attr);
+  brow_LoadPBM(ctx, "xnav_bitmap_attrarra", &pixmap_attrarray);
 }
 
 //

src/tools/bld/src/os_linux/mmi_generic.mk

@@ -30,6 +30,7 @@ vpath %.uil $(hw_source):$(os_source):$(co_source)
 vpath %.pwg $(hw_source):$(os_source):$(co_source)
 vpath %.pwsg $(hw_source):$(os_source):$(co_source)
 vpath %.png $(hw_source):$(os_source):$(co_source)
+vpath %.pbm $(hw_source):$(os_source):$(co_source)
 
 source_dirs := $(hw_source) $(os_source) $(co_source)
 
@@ -78,11 +79,21 @@ png_sources := $(sort \
              ) \
            )
 
+pbm_sources := $(sort \
+             $(foreach file, \
+               $(foreach dir, \
+                 $(source_dirs), \
+                 $(wildcard $(dir)/*.pbm) \
+               ), $(notdir $(file)) \
+             ) \
+           )
+
 export_uid := $(addprefix $(exe_dir)/, $(patsubst %.uil, %.uid, $(uil_sources)))
 export_c_pwg := $(addprefix $(exe_dir)/, $(pwg_c_sources))
 export_pwg := $(addprefix $(exe_dir)/, $(pwg_sources))
 export_pwsg := $(addprefix $(exe_dir)/, $(pwsg_sources))
 export_png := $(addprefix $(exe_dir)/, $(png_sources))
+export_pbm := $(addprefix $(exe_dir)/, $(pbm_sources))
 
 $(exe_dir)/%.uid : %.uil
 	@ $(log_uil_uid)
@@ -93,6 +104,7 @@ clean_c_pwg := $(patsubst %.pwg,clean_%.pwg,$(pwg_c_sources))
 clean_pwg := $(patsubst %.pwg,clean_%.pwg,$(pwg_sources))
 clean_pwsg := $(patsubst %.pwsg,clean_%.pwsg,$(pwsg_sources))
 clean_png := $(patsubst %.png,clean_%.png,$(png_sources))
+clean_pbm := $(patsubst %.pbm,clean_%.pbm,$(pbm_sources))
 
 .PHONY : all init copy lib exe clean realclean\
          dirs clean_bld clean_dirs $(clean_uid)
@@ -101,40 +113,43 @@ all : init copy | silent
 
 init : dirs | silent
 
-copy : $(export_uid) $(export_c_pwg) $(export_pwg) $(export_pwsg) $(export_png) | silent
+copy : $(export_uid) $(export_c_pwg) $(export_pwg) $(export_pwsg) $(export_png) $(export_pbm) | silent
 
 lib :
 
 exe :
 
-clean : $(clean_uid) $(clean_pwg) $(clean_pwsg) $(clean_png)
+clean : $(clean_uid) $(clean_pwg) $(clean_pwsg) $(clean_png) $(clean_pbm)
 
 realclean : clean
 
-dirs : 
+dirs :
 
 silent :
 	@ :
 
 $(clean_uid) : clean_%.uid : %.uil
 	@ echo "Removing uid"
-	@ $(rm) $(rmflags) $(exe_dir)/$*.uid  
+	@ $(rm) $(rmflags) $(exe_dir)/$*.uid
 
 $(clean_pwg) : clean_%.pwg : %.pwg
 	@ echo "Removing pwg"
-	@ $(rm) $(rmflags) $(exe_dir)/$*.pwg  
+	@ $(rm) $(rmflags) $(exe_dir)/$*.pwg
 
 $(clean_c_pwg) : clean_%.pwg : %.pwg
 	@ echo "Removing pwg"
-	@ $(rm) $(rmflags) $(exe_dir)/$*.pwg  
+	@ $(rm) $(rmflags) $(exe_dir)/$*.pwg
 
 $(clean_pwsg) : clean_%.pwsg : %.pwsg
 	@ echo "Removing pwsg"
-	@ $(rm) $(rmflags) $(exe_dir)/$*.pwsg  
+	@ $(rm) $(rmflags) $(exe_dir)/$*.pwsg
 
 $(clean_png) : clean_%.png : %.png
 	@ echo "Removing png"
-	@ $(rm) $(rmflags) $(exe_dir)/$*.png  
+	@ $(rm) $(rmflags) $(exe_dir)/$*.png
 
+$(clean_pbm) : clean_%.pbm : %.pbm
+	@ echo "Removing pbm"
+	@ $(rm) $(rmflags) $(exe_dir)/$*.pbm
 
 endif

src/tools/bld/src/os_linux/rules.mk

@@ -272,6 +272,18 @@ $(web_dir)/%.png : %.png
 	@ $(log_h_h)
 	@ $(cp) $(cpflags) $(source) $(target)
 
+$(bld_dir)/%.pbm : %.pbm
+	@ $(log_h_h)
+	@ $(cp) $(cpflags) $(source) $(target)
+
+$(exe_dir)/%.pbm : %.pbm
+	@ $(log_h_h)
+	@ $(cp) $(cpflags) $(source) $(target)
+
+$(web_dir)/%.pbm : %.pbm
+	@ $(log_h_h)
+	@ $(cp) $(cpflags) $(source) $(target)
+
 $(exe_dir)/%.html : ../../%.html
 	@ $(log_h_h)
 	@ $(cp) $(cpflags) $(source) $(target)

wb/lib/wb/src/wb_bckwnav.cpp

@@ -34,20 +34,14 @@
  * General Public License plus this exception.
  */
 
-/* wb_logwnav.cpp -- Backupfile display window */
+/* wb_bckwnav.cpp -- Backupfile display window */
+
+#include "pwr_baseclasses.h"
 
 #include "co_string.h"
 #include "co_time.h"
 
-#include "xnav_bitmap_save12.h"
-#include "xnav_bitmap_build12.h"
-#include "xnav_bitmap_package12.h"
-#include "xnav_bitmap_copy12.h"
-#include "xnav_bitmap_export12.h"
-#include "xnav_bitmap_clone12.h"
-
 #include "wb_bckwnav.h"
-#include "pwr_baseclasses.h"
 #include "wb_ldh_msg.h"
 
 //
@@ -68,56 +62,12 @@ void WbBckWNavBrow::free_pixmaps()
 //
 void WbBckWNavBrow::allocate_pixmaps()
 {
-  flow_sPixmapData pixmap_data;
-  int i;
-
-  for (i = 0; i < 9; i++) {
-    pixmap_data[i].width = xnav_bitmap_save12_width;
-    pixmap_data[i].height = xnav_bitmap_save12_height;
-    pixmap_data[i].bits = xnav_bitmap_save12_bits;
-  }
-
-  brow_AllocAnnotPixmap(ctx, &pixmap_data, &pixmap_save);
-
-  for (i = 0; i < 9; i++) {
-    pixmap_data[i].width = xnav_bitmap_build12_width;
-    pixmap_data[i].height = xnav_bitmap_build12_height;
-    pixmap_data[i].bits = xnav_bitmap_build12_bits;
-  }
-
-  brow_AllocAnnotPixmap(ctx, &pixmap_data, &pixmap_build);
-
-  for (i = 0; i < 9; i++) {
-    pixmap_data[i].width = xnav_bitmap_package12_width;
-    pixmap_data[i].height = xnav_bitmap_package12_height;
-    pixmap_data[i].bits = xnav_bitmap_package12_bits;
-  }
-
-  brow_AllocAnnotPixmap(ctx, &pixmap_data, &pixmap_package);
-
-  for (i = 0; i < 9; i++) {
-    pixmap_data[i].width = xnav_bitmap_copy12_width;
-    pixmap_data[i].height = xnav_bitmap_copy12_height;
-    pixmap_data[i].bits = xnav_bitmap_copy12_bits;
-  }
-
-  brow_AllocAnnotPixmap(ctx, &pixmap_data, &pixmap_copy);
-
-  for (i = 0; i < 9; i++) {
-    pixmap_data[i].width = xnav_bitmap_export12_width;
-    pixmap_data[i].height = xnav_bitmap_export12_height;
-    pixmap_data[i].bits = xnav_bitmap_export12_bits;
-  }
-
-  brow_AllocAnnotPixmap(ctx, &pixmap_data, &pixmap_export);
-
-  for (i = 0; i < 9; i++) {
-    pixmap_data[i].width = xnav_bitmap_clone12_width;
-    pixmap_data[i].height = xnav_bitmap_clone12_height;
-    pixmap_data[i].bits = xnav_bitmap_clone12_bits;
-  }
-
-  brow_AllocAnnotPixmap(ctx, &pixmap_data, &pixmap_clone);
+  brow_LoadPBM(ctx, "xnav_bitmap_save", &pixmap_save);
+  brow_LoadPBM(ctx, "xnav_bitmap_build", &pixmap_build);
+  brow_LoadPBM(ctx, "xnav_bitmap_package", &pixmap_package);
+  brow_LoadPBM(ctx, "xnav_bitmap_copy", &pixmap_copy);
+  brow_LoadPBM(ctx, "xnav_bitmap_export", &pixmap_export);
+  brow_LoadPBM(ctx, "xnav_bitmap_clone", &pixmap_clone);
 }
 
 //

wb/lib/wb/src/wb_expwnav.cpp

@@ -38,47 +38,15 @@
 
 #include <stdio.h>
 
+#include "pwr_baseclasses.h"
 #include "pwr_names.h"
 
 #include "co_string.h"
 #include "co_time.h"
 
-#include "xnav_bitmap_export8.h"
-#include "xnav_bitmap_export10.h"
-#include "xnav_bitmap_export12.h"
-#include "xnav_bitmap_export14.h"
-#include "xnav_bitmap_export16.h"
-#include "xnav_bitmap_export18.h"
-#include "xnav_bitmap_export20.h"
-#include "xnav_bitmap_export24.h"
-#include "xnav_bitmap_leaf8.h"
-#include "xnav_bitmap_leaf10.h"
-#include "xnav_bitmap_leaf12.h"
-#include "xnav_bitmap_leaf14.h"
-#include "xnav_bitmap_leaf16.h"
-#include "xnav_bitmap_leaf18.h"
-#include "xnav_bitmap_leaf20.h"
-#include "xnav_bitmap_leaf24.h"
-#include "xnav_bitmap_map8.h"
-#include "xnav_bitmap_map10.h"
-#include "xnav_bitmap_map12.h"
-#include "xnav_bitmap_map14.h"
-#include "xnav_bitmap_map16.h"
-#include "xnav_bitmap_map18.h"
-#include "xnav_bitmap_map20.h"
-#include "xnav_bitmap_map24.h"
-#include "xnav_bitmap_openmap8.h"
-#include "xnav_bitmap_openmap10.h"
-#include "xnav_bitmap_openmap12.h"
-#include "xnav_bitmap_openmap14.h"
-#include "xnav_bitmap_openmap16.h"
-#include "xnav_bitmap_openmap18.h"
-#include "xnav_bitmap_openmap20.h"
-#include "xnav_bitmap_openmap24.h"
-
 #include "cow_msgwindow.h"
+
 #include "wb_expwnav.h"
-#include "pwr_baseclasses.h"
 #include "wb_ldh_msg.h"
 
 //
@@ -97,131 +65,10 @@ void WbExpWNavBrow::free_pixmaps()
 //
 void WbExpWNavBrow::allocate_pixmaps()
 {
-  flow_sPixmapData pixmap_data;
-  int i;
-
-  i = 0;
-  pixmap_data[i].width = xnav_bitmap_export8_width;
-  pixmap_data[i].height = xnav_bitmap_export8_height;
-  pixmap_data[i++].bits = xnav_bitmap_export8_bits;
-  pixmap_data[i].width = xnav_bitmap_export10_width;
-  pixmap_data[i].height = xnav_bitmap_export10_height;
-  pixmap_data[i++].bits = xnav_bitmap_export10_bits;
-  pixmap_data[i].width = xnav_bitmap_export12_width;
-  pixmap_data[i].height = xnav_bitmap_export12_height;
-  pixmap_data[i++].bits = xnav_bitmap_export12_bits;
-  pixmap_data[i].width = xnav_bitmap_export14_width;
-  pixmap_data[i].height = xnav_bitmap_export14_height;
-  pixmap_data[i++].bits = xnav_bitmap_export14_bits;
-  pixmap_data[i].width = xnav_bitmap_export16_width;
-  pixmap_data[i].height = xnav_bitmap_export16_height;
-  pixmap_data[i++].bits = xnav_bitmap_export16_bits;
-  pixmap_data[i].width = xnav_bitmap_export18_width;
-  pixmap_data[i].height = xnav_bitmap_export18_height;
-  pixmap_data[i++].bits = xnav_bitmap_export18_bits;
-  pixmap_data[i].width = xnav_bitmap_export20_width;
-  pixmap_data[i].height = xnav_bitmap_export20_height;
-  pixmap_data[i++].bits = xnav_bitmap_export20_bits;
-  pixmap_data[i].width = xnav_bitmap_export20_width;
-  pixmap_data[i].height = xnav_bitmap_export20_height;
-  pixmap_data[i++].bits = xnav_bitmap_export20_bits;
-  pixmap_data[i].width = xnav_bitmap_export24_width;
-  pixmap_data[i].height = xnav_bitmap_export24_height;
-  pixmap_data[i++].bits = xnav_bitmap_export24_bits;
-
-  brow_AllocAnnotPixmap(ctx, &pixmap_data, &pixmap_export);
-
-  i = 0;
-  pixmap_data[i].width = xnav_bitmap_leaf8_width;
-  pixmap_data[i].height = xnav_bitmap_leaf8_height;
-  pixmap_data[i++].bits = xnav_bitmap_leaf8_bits;
-  pixmap_data[i].width = xnav_bitmap_leaf10_width;
-  pixmap_data[i].height = xnav_bitmap_leaf10_height;
-  pixmap_data[i++].bits = xnav_bitmap_leaf10_bits;
-  pixmap_data[i].width = xnav_bitmap_leaf12_width;
-  pixmap_data[i].height = xnav_bitmap_leaf12_height;
-  pixmap_data[i++].bits = xnav_bitmap_leaf12_bits;
-  pixmap_data[i].width = xnav_bitmap_leaf14_width;
-  pixmap_data[i].height = xnav_bitmap_leaf14_height;
-  pixmap_data[i++].bits = xnav_bitmap_leaf14_bits;
-  pixmap_data[i].width = xnav_bitmap_leaf16_width;
-  pixmap_data[i].height = xnav_bitmap_leaf16_height;
-  pixmap_data[i++].bits = xnav_bitmap_leaf16_bits;
-  pixmap_data[i].width = xnav_bitmap_leaf18_width;
-  pixmap_data[i].height = xnav_bitmap_leaf18_height;
-  pixmap_data[i++].bits = xnav_bitmap_leaf18_bits;
-  pixmap_data[i].width = xnav_bitmap_leaf20_width;
-  pixmap_data[i].height = xnav_bitmap_leaf20_height;
-  pixmap_data[i++].bits = xnav_bitmap_leaf20_bits;
-  pixmap_data[i].width = xnav_bitmap_leaf20_width;
-  pixmap_data[i].height = xnav_bitmap_leaf20_height;
-  pixmap_data[i++].bits = xnav_bitmap_leaf20_bits;
-  pixmap_data[i].width = xnav_bitmap_leaf24_width;
-  pixmap_data[i].height = xnav_bitmap_leaf24_height;
-  pixmap_data[i++].bits = xnav_bitmap_leaf24_bits;
-
-  brow_AllocAnnotPixmap(ctx, &pixmap_data, &pixmap_leaf);
-  i = 0;
-  pixmap_data[i].width = xnav_bitmap_map8_width;
-  pixmap_data[i].height = xnav_bitmap_map8_height;
-  pixmap_data[i++].bits = xnav_bitmap_map8_bits;
-  pixmap_data[i].width = xnav_bitmap_map10_width;
-  pixmap_data[i].height = xnav_bitmap_map10_height;
-  pixmap_data[i++].bits = xnav_bitmap_map10_bits;
-  pixmap_data[i].width = xnav_bitmap_map12_width;
-  pixmap_data[i].height = xnav_bitmap_map12_height;
-  pixmap_data[i++].bits = xnav_bitmap_map12_bits;
-  pixmap_data[i].width = xnav_bitmap_map14_width;
-  pixmap_data[i].height = xnav_bitmap_map14_height;
-  pixmap_data[i++].bits = xnav_bitmap_map14_bits;
-  pixmap_data[i].width = xnav_bitmap_map16_width;
-  pixmap_data[i].height = xnav_bitmap_map16_height;
-  pixmap_data[i++].bits = xnav_bitmap_map16_bits;
-  pixmap_data[i].width = xnav_bitmap_map18_width;
-  pixmap_data[i].height = xnav_bitmap_map18_height;
-  pixmap_data[i++].bits = xnav_bitmap_map18_bits;
-  pixmap_data[i].width = xnav_bitmap_map20_width;
-  pixmap_data[i].height = xnav_bitmap_map20_height;
-  pixmap_data[i++].bits = xnav_bitmap_map20_bits;
-  pixmap_data[i].width = xnav_bitmap_map20_width;
-  pixmap_data[i].height = xnav_bitmap_map20_height;
-  pixmap_data[i++].bits = xnav_bitmap_map20_bits;
-  pixmap_data[i].width = xnav_bitmap_map24_width;
-  pixmap_data[i].height = xnav_bitmap_map24_height;
-  pixmap_data[i++].bits = xnav_bitmap_map24_bits;
-
-  brow_AllocAnnotPixmap(ctx, &pixmap_data, &pixmap_map);
-
-  i = 0;
-  pixmap_data[i].width = xnav_bitmap_openmap8_width;
-  pixmap_data[i].height = xnav_bitmap_openmap8_height;
-  pixmap_data[i++].bits = xnav_bitmap_openmap8_bits;
-  pixmap_data[i].width = xnav_bitmap_openmap10_width;
-  pixmap_data[i].height = xnav_bitmap_openmap10_height;
-  pixmap_data[i++].bits = xnav_bitmap_openmap10_bits;
-  pixmap_data[i].width = xnav_bitmap_openmap12_width;
-  pixmap_data[i].height = xnav_bitmap_openmap12_height;
-  pixmap_data[i++].bits = xnav_bitmap_openmap12_bits;
-  pixmap_data[i].width = xnav_bitmap_openmap14_width;
-  pixmap_data[i].height = xnav_bitmap_openmap14_height;
-  pixmap_data[i++].bits = xnav_bitmap_openmap14_bits;
-  pixmap_data[i].width = xnav_bitmap_openmap16_width;
-  pixmap_data[i].height = xnav_bitmap_openmap16_height;
-  pixmap_data[i++].bits = xnav_bitmap_openmap16_bits;
-  pixmap_data[i].width = xnav_bitmap_openmap18_width;
-  pixmap_data[i].height = xnav_bitmap_openmap18_height;
-  pixmap_data[i++].bits = xnav_bitmap_openmap18_bits;
-  pixmap_data[i].width = xnav_bitmap_openmap20_width;
-  pixmap_data[i].height = xnav_bitmap_openmap20_height;
-  pixmap_data[i++].bits = xnav_bitmap_openmap20_bits;
-  pixmap_data[i].width = xnav_bitmap_openmap20_width;
-  pixmap_data[i].height = xnav_bitmap_openmap20_height;
-  pixmap_data[i++].bits = xnav_bitmap_openmap20_bits;
-  pixmap_data[i].width = xnav_bitmap_openmap24_width;
-  pixmap_data[i].height = xnav_bitmap_openmap24_height;
-  pixmap_data[i++].bits = xnav_bitmap_openmap24_bits;
-
-  brow_AllocAnnotPixmap(ctx, &pixmap_data, &pixmap_openmap);
+  brow_LoadPBMs(ctx, "xnav_bitmap_export", &pixmap_export);
+  brow_LoadPBMs(ctx, "xnav_bitmap_leaf", &pixmap_leaf);
+  brow_LoadPBMs(ctx, "xnav_bitmap_map", &pixmap_map);
+  brow_LoadPBMs(ctx, "xnav_bitmap_openmap", &pixmap_openmap);
 }
 
 //

xtt/exp/ge/src/os_templ/hw_templ/makefile

@@ -123,6 +123,3 @@ $(clean_web) : clean_%.pwgc : %.pwgc
 $(exe_dir)/pwr_css.css : ../../pwr_css.css
 	@ echo "copy $(source) $(target)"
 	@ cp $(source) $(target)
-
-
-