Log Message:
-----------
HEAD backport: Avoids some name collisions for images converted from gif
to png in hardcopy (jj)
Tags:
----
rel-2-1-patches
Modified Files:
--------------
pg/macros:
dangerousMacros.pl
Revision Data
-------------
Index: dangerousMacros.pl
===================================================================
RCS file: /webwork/cvs/system/pg/macros/dangerousMacros.pl,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -Lmacros/dangerousMacros.pl -Lmacros/dangerousMacros.pl -u -r1.31 -r1.31.2.1
--- macros/dangerousMacros.pl
+++ macros/dangerousMacros.pl
@@ -986,7 +986,7 @@
my $gifFileName = fileFromPath($gifFilePath);
$gifFileName =~ /^(.*)\.gif$/;
- my $pngFilePath = surePathToTmpFile("${tempDirectory}png/$1.png");
+ my $pngFilePath = surePathToTmpFile("${tempDirectory}png/$probNum-$1.png");
my $returnCode = system "$envir{externalGif2PngPath} $gifFilePath $pngFilePath";
if ($returnCode or not -e $pngFilePath) {
|
