Replace usages of sdlshapes.jpg with sdlshapes.png

There were a lot of compression artifacts in the .jpg, which the .png
doesn't have. It's rendering black lines
and text on a white background, JPEG's
compression wasn't really made for this.

As a bonus, this cuts a dep on the GMT library.

diff --git a/doc/info/Makefile.am b/doc/info/Makefile.am
index b1733fff4e64514f6aff8c21c284a91e7a090838..7e98680e532b22f489e8d94438f0d47da3362c41 100644 (file)
--- a/doc/info/Makefile.am
+++ b/doc/info/Makefile.am
@@ -26,7 +26,7 @@ html_DATA = attrs.html colors.html command.html \
   invtriangle.gif mrecord.gif nohead.gif none.gif plain.gif note.gif octagon.gif \
   oval.gif parallelogram.gif pentagon.gif plaintext.gif point.gif polygon.gif \
   record.gif record2.gif rect.gif rectangle.gif round.gif septagon.gif tab.gif \
-  trapezium.gif triangle.gif tripleoctagon.gif sdlshapes.jpg sdlshapes.png \
+  trapezium.gif triangle.gif tripleoctagon.gif sdlshapes.png \
   square.gif html2.gv html3.gv html4.gv plugins.png \
   c_bold.png c_dashed.png c_dotted.png c_filled.png c_rounded.png c_solid.png c_striped.png \
   e_bold.png e_dashed.png e_dotted.png e_solid.png \

diff --git a/doc/info/sdlshapes.jpg b/doc/info/sdlshapes.jpg
deleted file mode 100644 (file)
index b893d03..0000000
Binary files a/doc/info/sdlshapes.jpg and /dev/null differ

diff --git a/doc/info/shapes.html b/doc/info/shapes.html
index 4819099f2e5378071d64418a47cf0446a9921123..43a46a9a38c06b991fc4b4119505bdff9a56be4d 100644 (file)
--- a/doc/info/shapes.html
+++ b/doc/info/shapes.html
@@ -1261,7 +1261,7 @@ The table below
 gives the shape names and the corresponding node shapes.
 <P>
 <CENTER>
-<IMG SRC=sdlshapes.jpg>
+<IMG SRC=sdlshapes.png>
 </CENTER>
 </BODY>
 </HTML>

diff --git a/doc/infosrc/Makefile b/doc/infosrc/Makefile
index 01ce342f45107123477294f874f3ecbff86310b6..d915bc48910ff07739e0be22832746c8a3866df4 100644 (file)
--- a/doc/infosrc/Makefile
+++ b/doc/infosrc/Makefile
@@ -3,8 +3,7 @@
 #
 # Required tools: cc, dot, awk, ksh, yacc, gs, python.
 #  dot is used in mkarrows.sh, mkshapes.sh, mkstyles.sh, mktapers.sh, mksplines.sh
-#  ps_to_png.sh and other make rules rely on netpbm tools 
-#  and psconvert, which is part of the GMT library.
+#  ps_to_png.sh and other make rules rely on netpbm tools.
 #  
 #  Install python modules with:
 #  $ pip install --user -r requirements.txt
@@ -37,8 +36,6 @@ XGIF = forward.gif back.gif both.gif nohead.gif
 MGIF = constraint.gif record.gif html1.gif html2.gif fill.gif round.gif \
        mrecord.gif html3.gif html4.gif colorlist.gif record2.gif fixed.gif tee.gif
 
-MJPG = sdlshapes.jpg
-
 GRADPNG = g_lin0.png g_wlin0.png g_rad0.png g_lin45.png g_wlin45.png g_rad45.png g_lin90.png g_wlin90.png g_rad90.png \
           g_lin180.png g_wlin180.png g_rad180.png g_lin270.png g_wlin270.png g_rad270.png g_lin360.png g_wlin360.png g_rad360.png
 
@@ -93,7 +90,7 @@ DOTS = html2.gv html3.gv html4.gv tee.gv
 HTML = attrs.html colors.html command.html lang.html output.html shapes.html \
        arrows.html schema.html
 MISC = graphviz_json_schema.json w3data.js
-INSTALL_FILES = $(HTML) $(DOTS) $(SGIF) $(AGIF) $(A2GIF) $(MGIF) $(XGIF) $(MJPG) $(MPNG) $(MISC)
+INSTALL_FILES = $(HTML) $(DOTS) $(SGIF) $(AGIF) $(A2GIF) $(MGIF) $(XGIF) $(MPNG) $(MISC)
 
 .SUFFIXES: .gv .gif .dot .png
 
@@ -119,12 +116,6 @@ record2.gif : record.dot
 sdlshapes.ps : sdlshapes.dot
        dot -Tps -lsdl.ps sdlshapes.dot > sdlshapes.ps
 
-sdlshapes.ppm: sdlshapes.ps
-       gmt psconvert sdlshapes.ps -Tm -A -E800
-
-sdlshapes.jpg : sdlshapes.ppm
-       cat sdlshapes.ppm | pamscale .1 | pnmtojpeg >sdlshapes.jpg
-
 sdlshapes.png : sdlshapes.ps
        ./ps_to_png.sh sdlshapes.ps sdlshapes.png
 

diff --git a/doc/infosrc/shapes.3 b/doc/infosrc/shapes.3
index 06cde6eecc1b073bfce15a638851db81a987f0a3..d9636d2f49946963b3cc19129ffdde01737faa71 100644 (file)
--- a/doc/infosrc/shapes.3
+++ b/doc/infosrc/shapes.3
@@ -22,7 +22,7 @@ The table below
 gives the shape names and the corresponding node shapes.
 <P>
 <CENTER>
-<IMG SRC=sdlshapes.jpg>
+<IMG SRC=sdlshapes.png>
 </CENTER>
 </BODY>
 </HTML>