Fix bugs in copy() methods.

Add Fl_Shared_Image class, with get() and release() methods.

Update Fl_Help_View to use Fl_Shared_Image class.

Update image demo to accept a filename, and to use the Fl_Shared_Image
class.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1714 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

3 files changed, 31 insertions, 17 deletions

diff --git a/test/Makefile b/test/Makefile
index e65c5bf96..9e6dc2256 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile,v 1.19.2.7.2.10 2001/11/19 21:25:35 easysw Exp $"
+# "$Id: Makefile,v 1.19.2.7.2.11 2001/11/24 02:46:19 easysw Exp $"
 #
 # Test/example program makefile for the Fast Light Tool Kit (FLTK).
 #
@@ -129,6 +129,9 @@ file_chooser$(EXEEXT): file_chooser.cxx
 help$(EXEEXT): help.cxx
 	echo Compiling and linking $@...
 	$(CXX) -I.. $(CXXFLAGS) help.cxx -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
+image$(EXEEXT): image.cxx
+	echo Compiling and linking $@...
+	$(CXX) -I.. $(CXXFLAGS) image.cxx -o $@ $(LINKFLTK) $(LDLIBS) $(IMAGELIBS)
 keyboard$(EXEEXT): keyboard.cxx keyboard_ui.cxx
 	echo Compiling and linking $@...
 	$(CXX) -I.. $(CXXFLAGS) keyboard.cxx $(LINKFLTK) $(LDLIBS) -o $@
@@ -189,5 +192,5 @@ uninstall:
 	@echo Nothing to uninstall in test directory.
 
 #
-# End of "$Id: Makefile,v 1.19.2.7.2.10 2001/11/19 21:25:35 easysw Exp $".
+# End of "$Id: Makefile,v 1.19.2.7.2.11 2001/11/24 02:46:19 easysw Exp $".
 #
diff --git a/test/image.cxx b/test/image.cxx
index fe70b73cd..31205eb00 100644
--- a/test/image.cxx
+++ b/test/image.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: image.cxx,v 1.6.2.3.2.3 2001/11/19 01:06:45 easysw Exp $"
+// "$Id: image.cxx,v 1.6.2.3.2.4 2001/11/24 02:46:19 easysw Exp $"
 //
 // Fl_Image test program for the Fast Light Tool Kit (FLTK).
 //
@@ -30,7 +30,7 @@
 #include <FL/Fl.H>
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Button.H>
-#include <FL/Fl_Image.H>
+#include <FL/Fl_Shared_Image.H>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -96,13 +96,10 @@ int arg(int argc, char **argv, int &i) {
 }
 
 int main(int argc, char **argv) {
+  int i = 1;
 
 #ifndef WIN32
-  int i = 1;
-  if (Fl::args(argc,argv,i,arg) < argc) {
-    fprintf(stderr," -v # : use visual\n%s\n",Fl::help);
-    exit(1);
-  }
+  Fl::args(argc,argv,i,arg);
 
   if (visid >= 0) {
     fl_open_display();
@@ -125,10 +122,23 @@ int main(int argc, char **argv) {
   Fl_Window window(400,400); ::w = &window;
   window.color(FL_WHITE);
   Fl_Button b(140,160,120,120,"Image w/Alpha"); ::b = &b;
-  make_image();
-  Fl_RGB_Image *rgb = new Fl_RGB_Image(image, width, height,4);
-  Fl_RGB_Image *dergb;
-  dergb = (Fl_RGB_Image *)rgb->copy();
+
+  Fl_Image *rgb;
+  Fl_Image *dergb;
+
+  if (argv[1]) {
+    rgb = Fl_Shared_Image::get(argv[1]);
+    if (rgb->w() > 100 || rgb->h() > 100) {
+      if (rgb->w() > rgb->h()) rgb = rgb->copy(100, 100 * rgb->h() / rgb->w());
+      else rgb = rgb->copy(100 * rgb->w() / rgb->h(), 100);
+    }
+    b.label(argv[1]);
+  } else {
+    make_image();
+    rgb = new Fl_RGB_Image(image, width, height,4);
+  }
+
+  dergb = rgb->copy();
   dergb->inactive();
 
   b.image(rgb);
@@ -155,5 +165,5 @@ int main(int argc, char **argv) {
 }
 
 //
-// End of "$Id: image.cxx,v 1.6.2.3.2.3 2001/11/19 01:06:45 easysw Exp $".
+// End of "$Id: image.cxx,v 1.6.2.3.2.4 2001/11/24 02:46:19 easysw Exp $".
 //
diff --git a/test/makedepend b/test/makedepend
index 4dc209008..b3dafcb80 100644
--- a/test/makedepend
+++ b/test/makedepend
@@ -161,14 +161,15 @@ hello.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H
 hello.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Box.H
 help.o: ../FL/Fl_Help_Dialog.H ../FL/Fl.H ../FL/Enumerations.H
 help.o: ../FL/Fl_Export.H ../FL/Fl_Double_Window.H ../FL/Fl_Window.H
-help.o: ../FL/Fl_Help_View.H ../FL/Fl_Group.H ../FL/Fl_Scrollbar.H
-help.o: ../FL/Fl_Slider.H ../FL/fl_draw.H ../FL/Fl_Button.H
+help.o: ../FL/Fl_Help_View.H ../FL/Fl.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
+help.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/fl_draw.H
+help.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H ../FL/x.H ../FL/Fl_Button.H
 iconize.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H
 iconize.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Widget.H
 iconize.o: ../FL/Fl_Button.H ../FL/Fl_Box.H
 image.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H
 image.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Button.H
-image.o: ../FL/Fl_Image.H ../FL/x.H ../FL/Fl_Window.H
+image.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Image.H ../FL/x.H ../FL/Fl_Window.H
 image.o: ../FL/Fl_Toggle_Button.H ../FL/Fl_Button.H ../FL/x.H
 image.o: list_visuals.cxx ../config.h
 input.o: ../FL/Fl.H ../FL/Enumerations.H ../FL/Fl_Export.H ../FL/Fl_Window.H