- fix a few compiler warnings

- document the Imager::Font::BBox advance_width() method

diff --git a/Changes b/Changes
index 20c104eaf7ae2605bd66ca57874971011e926b08..be79a2611dfa84d6ee9fbe9697c10778f12c0dd9 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1057,6 +1057,8 @@ Revision history for Perl extension Imager.
 - the segments parameter supplied to the fountain filter and the
   fountain fill contructor now accepts color names or other 
   descriptions as other functions do.
 - the segments parameter supplied to the fountain filter and the
   fountain fill contructor now accepts color names or other 
   descriptions as other functions do.

+- fix a few compiler warnings
+- document the Imager::Font::BBox advance_width() method

 
 =================================================================
 
 
 =================================================================
 

diff --git a/TODO b/TODO
index a4dc4ad068f3ca3c9338c4954ad100842bc4da0b..6864a30e601a83991d22a98efdb1960b675683e2 100644 (file)
--- a/TODO
+++ b/TODO
@@ -14,6 +14,9 @@ not commitments.
 - implement i_incomplete for bmp files
 - check if freetype 2 is faster/slower than freetype 1 with Imager's glyph
   caching.  If FT1 is faster, add caching as a TODO for FT2.
 - implement i_incomplete for bmp files
 - check if freetype 2 is faster/slower than freetype 1 with Imager's glyph
   caching.  If FT1 is faster, add caching as a TODO for FT2.

+- add XS for i_tags_get_string() and test it.
+- test and fix problem with fallback value for 
+  Imager::Font::BBox->advance_width.

 - add sample CGI that handles an uploaded image (done)
 - examples for fountain filter in Imager::Filters
 - allow Imager::Fountain to take color descriptions (eg. blue, FF000)
 - add sample CGI that handles an uploaded image (done)
 - examples for fountain filter in Imager::Filters
 - allow Imager::Fountain to take color descriptions (eg. blue, FF000)

diff --git a/datatypes.c b/datatypes.c
index 41c9e6afeb719fce94892a72207e2f9352c0cb6e..2afdc9a5354110538600e789c285e6e6bd10b81a 100644 (file)
--- a/datatypes.c
+++ b/datatypes.c
@@ -2,7 +2,7 @@
 #include "datatypes.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include "datatypes.h"
 #include <stdlib.h>
 #include <stdio.h>

-
+#include <string.h>

 
 
 /*
 
 
 /*

diff --git a/freetyp2.c b/freetyp2.c
index 8cb6be9cf9b404a5433d28e03cb9f5303263dd89..66d9dd36def3a65937dd6e1c3cd6582c6f5d7b7b 100644 (file)
--- a/freetyp2.c
+++ b/freetyp2.c
@@ -766,6 +766,7 @@ Returns non-zero on success.
 =cut
 */
 
 =cut
 */
 

+int

 i_ft2_cp(FT2_Fonthandle *handle, i_img *im, int tx, int ty, int channel,
          double cheight, double cwidth, char const *text, int len, int align,
          int aa, int vlayout, int utf8) {
 i_ft2_cp(FT2_Fonthandle *handle, i_img *im, int tx, int ty, int channel,
          double cheight, double cwidth, char const *text, int len, int align,
          int aa, int vlayout, int utf8) {


@@ -1004,7 +1005,7 @@ i_ft2_glyph_name(FT2_Fonthandle *handle, unsigned long ch, char *name_buf,
     if (error) {
       ft2_push_message(error);
       *name_buf = '\0';
     if (error) {
       ft2_push_message(error);
       *name_buf = '\0';

-      return;
+      return 0;

     }
     if (*name_buf) {
       return strlen(name_buf) + 1;
     }
     if (*name_buf) {
       return strlen(name_buf) + 1;

diff --git a/iolayer.c b/iolayer.c
index 18f3b782e83a4906530d7f4a051775b2026eccec..7d500cf721de6aa5d7a0db263d0c04625a108206 100644 (file)
--- a/iolayer.c
+++ b/iolayer.c
@@ -6,6 +6,7 @@
 #ifdef _MSC_VER
 #include <io.h>
 #endif
 #ifdef _MSC_VER
 #include <io.h>
 #endif

+#include <string.h>

 
 #define IOL_DEB(x)
 
 
 #define IOL_DEB(x)
 

diff --git a/lib/Imager/Font/BBox.pm b/lib/Imager/Font/BBox.pm
index f39c86499f34865a1bc09b623f5bb5dd5c7a20c3..2246a0be041859ccd1a6957bd2345c0a0c3bb364 100644 (file)
--- a/lib/Imager/Font/BBox.pm
+++ b/lib/Imager/Font/BBox.pm
@@ -123,6 +123,9 @@ sub ascent {
 
 =item advance_width()
 
 
 =item advance_width()
 

+The advance width of the string, if the driver supports that,
+otherwise the same as end_offset.
+

 =cut
 
 sub advance_width {
 =cut
 
 sub advance_width {

diff --git a/log.c b/log.c
index c2b23e62a2bd04753fdd8ed1fc38b093ab18e5c3..4d7cd44a84ffd361c51b40a1ca9514f822cc9f06 100644 (file)
--- a/log.c
+++ b/log.c
@@ -1,5 +1,6 @@
 #include "imconfig.h"
 #include "log.h"
 #include "imconfig.h"
 #include "log.h"

+#include <stdlib.h>

 
 #define DTBUFF 50
 #define DATABUFF DTBUFF+3+10+1+5+1+1
 
 #define DTBUFF 50
 #define DATABUFF DTBUFF+3+10+1+5+1+1

diff --git a/rotate.c b/rotate.c
index ebdfda462d76580a2fb48ed12c39f068d27de514..cb2e3e58fe9898eec721b32a6965e8ee001e05a7 100644 (file)
--- a/rotate.c
+++ b/rotate.c
@@ -419,7 +419,7 @@ i_img *i_matrix_transform(i_img *src, int xsize, int ysize, double *matrix) {
   return i_matrix_transform_bg(src, xsize, ysize, matrix, NULL, NULL);
 }
 
   return i_matrix_transform_bg(src, xsize, ysize, matrix, NULL, NULL);
 }
 

-
+static void

 i_matrix_mult(double *dest, double *left, double *right) {
   int i, j, k;
   double accum;
 i_matrix_mult(double *dest, double *left, double *right) {
   int i, j, k;
   double accum;