From 612251b2b007761f8025fe34b72749c2a23c36cd Mon Sep 17 00:00:00 2001 From: Tim Edwards Date: Wed, 26 Feb 2020 10:10:55 -0500 Subject: [PATCH] Changed the PNG bitmaps to GIF, because PNG is not supported in Tcl/Tk 8.5, which is still installed and considered current/stable on a lot of systems. --- VERSION | 2 +- magic/Makefile | 2 +- magic/bitmaps/down.gif | Bin 0 -> 103 bytes magic/bitmaps/down.png | Bin 290 -> 0 bytes magic/bitmaps/left.gif | Bin 0 -> 103 bytes magic/bitmaps/left.png | Bin 291 -> 0 bytes magic/bitmaps/right.gif | Bin 0 -> 102 bytes magic/bitmaps/right.png | Bin 289 -> 0 bytes magic/bitmaps/up.gif | Bin 0 -> 102 bytes magic/bitmaps/up.png | Bin 290 -> 0 bytes magic/bitmaps/zoom.gif | Bin 0 -> 103 bytes magic/bitmaps/zoom.png | Bin 276 -> 0 bytes tcltk/wrapper.tcl | 10 +++++----- 13 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 magic/bitmaps/down.gif delete mode 100644 magic/bitmaps/down.png create mode 100644 magic/bitmaps/left.gif delete mode 100644 magic/bitmaps/left.png create mode 100644 magic/bitmaps/right.gif delete mode 100644 magic/bitmaps/right.png create mode 100644 magic/bitmaps/up.gif delete mode 100644 magic/bitmaps/up.png create mode 100644 magic/bitmaps/zoom.gif delete mode 100644 magic/bitmaps/zoom.png diff --git a/VERSION b/VERSION index 8ca3c547..877ae370 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.2.188 +8.2.189 diff --git a/magic/Makefile b/magic/Makefile index bb38fdcc..7eb68682 100644 --- a/magic/Makefile +++ b/magic/Makefile @@ -19,7 +19,7 @@ EXTRA_LIBS = ${MAGICDIR}/cmwind/libcmwind.o ${MAGICDIR}/commands/libcommands.o \ ${MAGICDIR}/plow/libplow.o ${MAGICDIR}/utils/libutils.o \ ${MAIN_EXTRA_LIBS} -BITMAPS = up.png down.png left.png right.png zoom.png lock.xbm +BITMAPS = up.gif down.gif left.gif right.gif zoom.gif lock.xbm DEST_XBM = $(BITMAPS:%=$(DESTDIR)${INSTALL_TCLDIR}/bitmaps/%) DFLAGS += -DMAGIC_DATE="\"`date`\"" -DCAD_DIR="${LIBDIR}" diff --git a/magic/bitmaps/down.gif b/magic/bitmaps/down.gif new file mode 100644 index 0000000000000000000000000000000000000000..7962f6f5ef6951fc71c8bc768cef0436e00cbcbd GIT binary patch literal 103 zcmZ?wbhEHbVkP47y1}5ni*~)6kGcqwnN~w;y>#E<@hW`k7sIn*`Oplep8USke BAA$e? literal 0 HcmV?d00001 diff --git a/magic/bitmaps/down.png b/magic/bitmaps/down.png deleted file mode 100644 index 78c995180b6f428b733ea99c8ed6cb8c0b2037de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 290 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4%JB>7u;-UBI?bVpxD28NCO+&S3Dk zz__fXwULpbQiP>m$K%LXpeEH4*NBpo#FA92@!;O_l%v diff --git a/magic/bitmaps/left.gif b/magic/bitmaps/left.gif new file mode 100644 index 0000000000000000000000000000000000000000..85b7e28cf66427cf58be544b3de90086df880987 GIT binary patch literal 103 zcmZ?wbhEHbVkP47y1}5ni`Q=hO@5p7nyO^>5p3S%Hj3AHR6w@TN1}RnsYXFQl BAW#4R literal 0 HcmV?d00001 diff --git a/magic/bitmaps/left.png b/magic/bitmaps/left.png deleted file mode 100644 index dd63f521c244b352b45a1b720c8043480dd02e23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 291 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4%JB>7u;-UBI?bVpxD28NCO+1b=SGH7YyFz6Q5 z;|^oL$asaDVdFj4q7$B7^MJZkOI#yLQW8s2t&)pUffR$0fsui(fswAEd5EEzm5G^^ qfr+kxsg;4j^huHFC>nC}Q!>*kacg*X{^4z)1_n=8KbLh*2~7a=eorR= diff --git a/magic/bitmaps/right.gif b/magic/bitmaps/right.gif new file mode 100644 index 0000000000000000000000000000000000000000..11853ba84d61c0e3fb3f8245c0910f9c6014738e GIT binary patch literal 102 zcmZ?wbhEHbVkP47y1}3Q%`Q_3(@65{zWQy9jto-+R+gYuVbDbAG31(oh1^{R1 BAmac4 literal 0 HcmV?d00001 diff --git a/magic/bitmaps/right.png b/magic/bitmaps/right.png deleted file mode 100644 index 4ae31e9c8a9e5fa3ed5a98ce2ba08c56beed6590..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4%JB>7u;-UBI?bVpxD28NCO+N1$1#t{3&#{_4-=zBos7JNLHKHUXu_V85l%cME*q4kei>9nO2EggI4N8SD*$4Pgg&ebxsLQ0LG?G{Qv*} diff --git a/magic/bitmaps/up.gif b/magic/bitmaps/up.gif new file mode 100644 index 0000000000000000000000000000000000000000..7f46b82a2ea7712f80c16fa9fbea9e6b4a35f8f2 GIT binary patch literal 102 zcmZ?wbhEHbVkP47y1}3Q%`Q=i3@7(Dwx!A3D?arxmmxO6O4H=6TXNfRa0|0%# BA>;r6 literal 0 HcmV?d00001 diff --git a/magic/bitmaps/up.png b/magic/bitmaps/up.png deleted file mode 100644 index cbe449739f642a032b31865f9d89db956199e578..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 290 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4%JB>7u;-UBI?bVpxD28NCO+!C8<`)MX5lF!N|bKK-a)X*U&t~(9Fuvz{>aG}y12r&sy85}Sb4q9e0Mh_XK>z>% diff --git a/magic/bitmaps/zoom.gif b/magic/bitmaps/zoom.gif new file mode 100644 index 0000000000000000000000000000000000000000..a05342d4dd6d95dee5d89d25a735710914455422 GIT binary patch literal 103 zcmZ?wbhEHbVkP47y1}5p2{*}^i`{wm1nr6M;=}`Q+an_8$pbDqcr{q`}tO1i- BA$7u;-UBI?bVpxD28NCO+?an+uemJjk_iV$dUGRaSY+Oo}AFYeC>jO#6bln aPsvQH#I2!Wf0hwY1B0ilpUXO@geCyo)k?Vl diff --git a/tcltk/wrapper.tcl b/tcltk/wrapper.tcl index 2758cd96..b798b5ef 100644 --- a/tcltk/wrapper.tcl +++ b/tcltk/wrapper.tcl @@ -35,23 +35,23 @@ proc magic::makeglyphimages {} { set gsize [expr {int($Opts(scale) * 13)}] set gscale [expr {int($Opts(scale))}] - image create photo stdglyph -file ${CAD_ROOT}/magic/tcl/bitmaps/up.png + image create photo stdglyph -file ${CAD_ROOT}/magic/tcl/bitmaps/up.gif image create photo Glyph(up) -width $gsize -height $gsize Glyph(up) copy stdglyph -zoom $gscale - image create photo stdglyph -file ${CAD_ROOT}/magic/tcl/bitmaps/down.png + image create photo stdglyph -file ${CAD_ROOT}/magic/tcl/bitmaps/down.gif image create photo Glyph(down) -width $gsize -height $gsize Glyph(down) copy stdglyph -zoom $gscale - image create photo stdglyph -file ${CAD_ROOT}/magic/tcl/bitmaps/left.png + image create photo stdglyph -file ${CAD_ROOT}/magic/tcl/bitmaps/left.gif image create photo Glyph(left) -width $gsize -height $gsize Glyph(left) copy stdglyph -zoom $gscale - image create photo stdglyph -file ${CAD_ROOT}/magic/tcl/bitmaps/right.png + image create photo stdglyph -file ${CAD_ROOT}/magic/tcl/bitmaps/right.gif image create photo Glyph(right) -width $gsize -height $gsize Glyph(right) copy stdglyph -zoom $gscale - image create photo stdglyph -file ${CAD_ROOT}/magic/tcl/bitmaps/zoom.png + image create photo stdglyph -file ${CAD_ROOT}/magic/tcl/bitmaps/zoom.gif image create photo Glyph(zoom) -width $gsize -height $gsize Glyph(zoom) copy stdglyph -zoom $gscale