GD plugin: squash -Wmissing-prototypes warnings for 'gd_psfontResolve'

diff --git a/plugin/gd/CMakeLists.txt b/plugin/gd/CMakeLists.txt
index cb826694a629fe27781dd1bea6f032e59be41a9a..fbf9b6d017a249798f44ddcbcb191124a20d6a54 100644 (file)
--- a/plugin/gd/CMakeLists.txt
+++ b/plugin/gd/CMakeLists.txt
@@ -4,6 +4,7 @@ if(GD_FOUND)
     # Source files
     gdioctx_wrapper.h
     gdgen_text.h
+    gd_psfontResolve.h
     gvdevice_gd.c
     gvloadimage_gd.c
     gvplugin_gd.c

diff --git a/plugin/gd/Makefile.am b/plugin/gd/Makefile.am
index c2b74eecbee5483695f30316b07112758c798c90..b23b733c7e37364c44d68d3739a1dbe4d6551e77 100644 (file)
--- a/plugin/gd/Makefile.am
+++ b/plugin/gd/Makefile.am
@@ -19,7 +19,7 @@ pkglib_LTLIBRARIES = libgvplugin_gd.la
 endif
 endif
 
-noinst_HEADERS = gdioctx_wrapper.h gdgen_text.h
+noinst_HEADERS = gdioctx_wrapper.h gdgen_text.h gd_psfontResolve.h
 libgvplugin_gd_C_la_SOURCES = \
        gvplugin_gd.c \
        gvrender_gd.c \

diff --git a/plugin/gd/gd_psfontResolve.h b/plugin/gd/gd_psfontResolve.h
new file mode 100644 (file)
index 0000000..6ffa2d9
--- /dev/null
+++ b/plugin/gd/gd_psfontResolve.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#include <common/geom.h>
+#include <common/textspan.h>
+
+char *gd_psfontResolve(PostscriptAlias *pa);

diff --git a/plugin/gd/gvplugin_gd.vcxproj b/plugin/gd/gvplugin_gd.vcxproj
index 4be0133eff02b25c6e4781ca43a0066cade88877..f98160725abde572f1c9494556c8a11b682fbce7 100644 (file)
--- a/plugin/gd/gvplugin_gd.vcxproj
+++ b/plugin/gd/gvplugin_gd.vcxproj
@@ -107,6 +107,7 @@ copy $(SolutionDir)windows\dependencies\libraries\x86\bin\pixman-1.dll $(OutDir)
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="gdgen_text.h" />
+    <ClInclude Include="gd_psfontResolve.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="gvdevice_gd.c" />

diff --git a/plugin/gd/gvplugin_gd.vcxproj.filters b/plugin/gd/gvplugin_gd.vcxproj.filters
index 448c1e82a5c2128095643af6949de0a9c7a4e4cd..0bf246a5440ca641995777ffcbffb1442a82336c 100644 (file)
--- a/plugin/gd/gvplugin_gd.vcxproj.filters
+++ b/plugin/gd/gvplugin_gd.vcxproj.filters
@@ -16,6 +16,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="gdgen_text.h" />
+    <ClInclude Include="gd_psfontResolve.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="gvdevice_gd.c">

diff --git a/plugin/gd/gvrender_gd.c b/plugin/gd/gvrender_gd.c
index 94324e585cfea70638b0cc097005b5cfe3d85df2..960271c34b4751e6f372dffe0b6650eb98c8ea82 100644 (file)
--- a/plugin/gd/gvrender_gd.c
+++ b/plugin/gd/gvrender_gd.c
@@ -11,6 +11,7 @@
 #include "config.h"
 #include "gdioctx_wrapper.h"
 #include "gdgen_text.h"
+#include "gd_psfontResolve.h"
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -316,8 +317,6 @@ void gdgen_text(gdImagePtr im, pointf spf, pointf epf, int fontcolor, double fon
     }
 }
 
-extern char* gd_psfontResolve (PostscriptAlias* pa);
-
 static void gdgen_textspan(GVJ_t * job, pointf p, textspan_t * span)
 {
     gdImagePtr im = job->context;

diff --git a/plugin/gd/gvtextlayout_gd.c b/plugin/gd/gvtextlayout_gd.c
index 7fdbfd770d8f013d8da53e4fac8cceb3247e09f5..eeed059ba79495cf4f28d23eacab3dcff2a02937 100644 (file)
--- a/plugin/gd/gvtextlayout_gd.c
+++ b/plugin/gd/gvtextlayout_gd.c
@@ -9,7 +9,7 @@
  *************************************************************************/
 
 #include "config.h"
-
+#include "gd_psfontResolve.h"
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>