[Libreoffice-commits] .: 2 commits - vcl/source

[Caolán McNamara]

 vcl/source/fontsubset/cff.cxx |    4 ++--
 vcl/source/fontsubset/sft.cxx |   16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit ec0419a1c7d81bf54bb92c405d80c2c44e2c819b
Author: Nigel Hawkins <n.hawkins at gmx.com>
Date:   Wed Nov 3 16:05:28 2010 +0000

    vcl: fix fprintf compile warnings in cff.cxx

diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 854c03a..8536961 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -2048,7 +2048,7 @@ void Type1Emitter::emitValVector( const char* pLineHead, const char* pLineTail,
         return;
 
     // emit the line head
-    mpPtr += sprintf( mpPtr, pLineHead);
+    mpPtr += sprintf( mpPtr, "%s", pLineHead);
     // emit the vector values
     ValVector::value_type aVal = 0;
     for( ValVector::const_iterator it = rVector.begin();;) {
@@ -2061,7 +2061,7 @@ void Type1Emitter::emitValVector( const char* pLineHead, const char* pLineTail,
     // emit the last value
     mpPtr += dbl2str( mpPtr, aVal);
     // emit the line tail
-    mpPtr += sprintf( mpPtr, pLineTail);
+    mpPtr += sprintf( mpPtr, "%s", pLineTail);
 }
 
 // --------------------------------------------------------------------
commit 4a6280a7c3d054a42dfbb9159413a63536cd0f65
Author: Nigel Hawkins <n.hawkins at gmx.com>
Date:   Wed Nov 3 16:02:56 2010 +0000

    vcl: fix fprintf compile warnings in sft.cxx

diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index aa6fd99..5a54ef2 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -2058,7 +2058,7 @@ int  CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, /*FO
     fprintf(outf, h02, modname, modver, modextra);
     fprintf(outf, h09, ttf->psname);
 
-    fprintf(outf, h10);
+    fprintf(outf, "%s", h10);
     fprintf(outf, h11, fname);
 /*    fprintf(outf, h12, 4000000); */
 
@@ -2073,17 +2073,17 @@ int  CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, /*FO
      */
 
     fprintf(outf, h17, rtl_crc32(0, ttf->ptr, ttf->fsize), nGlyphs, rtl_crc32(0, glyphArray, nGlyphs * 2), rtl_crc32(0, encoding, nGlyphs));
-    fprintf(outf, h13);
+    fprintf(outf, "%s", h13);
     fprintf(outf, h14, XUnits(UPEm, GetInt16(table, 36, 1)), XUnits(UPEm, GetInt16(table, 38, 1)), XUnits(UPEm, GetInt16(table, 40, 1)), XUnits(UPEm, GetInt16(table, 42, 1)));
-    fprintf(outf, h15);
+    fprintf(outf, "%s", h15);
 
     for (i = 0; i < nGlyphs; i++) {
         fprintf(outf, h16, encoding[i], i);
     }
 
     fprintf(outf, h30, nGlyphs+1);
-    fprintf(outf, h31);
-    fprintf(outf, h32);
+    fprintf(outf, "%s", h31);
+    fprintf(outf, "%s", h32);
 
     for (i = 0; i < nGlyphs; i++) {
         fprintf(outf, h33, i);
@@ -2131,14 +2131,14 @@ int  CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, /*FO
         }
         if (n > 0) fprintf(outf, "\tfill\n");     /* if glyph is not a whitespace character */
 
-        fprintf(outf, h34);
+        fprintf(outf, "%s", h34);
 
         free(pa);
         free(path);
     }
-    fprintf(outf, h35);
+    fprintf(outf, "%s", h35);
 
-    fprintf(outf, h40);
+    fprintf(outf, "%s", h40);
     fprintf(outf, h41, fname);
 
     return SF_OK;