• R/O
  • SSH

GM: Commit

Main GraphicsMagick source repository


Commit MetaInfo

Revision24d85185b7a3b5a5e9cc74ebf7d0e94ca60d7157 (tree)
Time2000-12-08 00:02:01
AuthorJohn Cristy <duc.sequere.aut.de.via.decede@gmai...>
CommiterJohn Cristy

Log Message

*** empty log message ***

Change Summary

Incremental Difference

diff -r 9f6a072cac55 -r 24d85185b7a3 magick/annotate.c
--- a/magick/annotate.c Wed Dec 06 23:01:18 2000 -0600
+++ b/magick/annotate.c Thu Dec 07 09:02:01 2000 -0600
@@ -718,6 +718,10 @@
718718 FT_Done_Face(face);
719719 status=True;
720720 p=getenv("TT_FONT_PATH");
721+#if defined(TT_FONT_PATH)
722+ if (p != (char *) NULL)
723+ p=TT_FONT_PATH;
724+#endif
721725 if (p != (char *) NULL)
722726 for ( ; ; )
723727 {
@@ -741,34 +745,6 @@
741745 break;
742746 p=q+1;
743747 }
744-#if defined(TT_FONT_PATH)
745- if (status)
746- {
747- /*
748- Configured Truetype font path.
749- */
750- p=TT_FONT_PATH;
751- for ( ; ; )
752- {
753- q=strchr(p,DirectoryListSeparator);
754- if (q == (char *) NULL)
755- (void) strcpy(filename,p);
756- else
757- {
758- (void) strncpy(filename,p,q-p);
759- filename[q-p]='\0';
760- }
761- i=strlen(filename);
762- if ((i > 0) && (!IsBasenameSeparator(filename[i-1])))
763- (void) strcat(filename,DirectorySeparator);
764- (void) strcat(filename,annotate_info->font);
765- status=FT_New_Face(library,filename,0,&face);
766- if (!status || (q == (char *) NULL) || (*q == '\0'))
767- break;
768- p=q+1;
769- }
770- }
771-#endif
772748 if (status)
773749 status=FT_New_Face(library,annotate_info->font,0,&face);
774750 if (status)
Show on old repository browser