View | Details | Raw Unified | Return to bug 186171
Collapse All | Expand All

(-)magick/annotate.c (-1 / +1 lines)
Lines 85-91 Link Here
85 
#if defined(FT_FREETYPE_H)
 85 
#if defined(FT_FREETYPE_H)
86 
#  include FT_FREETYPE_H
 86 
#  include FT_FREETYPE_H
87 
#else
 87 
#else
88 
#  include <freetype/freetype.h>
 88 
#  include <freetype2/freetype.h>
89 
#endif
 89 
#endif
90 
#if defined(FT_GLYPH_H)
 90 
#if defined(FT_GLYPH_H)
91 
#  include FT_GLYPH_H
 91 
#  include FT_GLYPH_H
(-)www/api/MagickCore/annotate_8c.html (-4 / +4 lines)
Lines 37-46 Link Here
37 
<code>#include &quot;<a class="el" href="utility_8h-source.html">magick/utility.h</a>&quot;</code><br>
 37 
<code>#include &quot;<a class="el" href="utility_8h-source.html">magick/utility.h</a>&quot;</code><br>
38 
<code>#include &quot;<a class="el" href="xwindow-private_8h-source.html">magick/xwindow-private.h</a>&quot;</code><br>
 38 
<code>#include &quot;<a class="el" href="xwindow-private_8h-source.html">magick/xwindow-private.h</a>&quot;</code><br>
39 
<code>#include &lt;ft2build.h&gt;</code><br>
 39 
<code>#include &lt;ft2build.h&gt;</code><br>
40 
<code>#include &lt;freetype/freetype.h&gt;</code><br>
 40 
<code>#include &lt;freetype2/freetype.h&gt;</code><br>
41 
<code>#include &lt;freetype/ftglyph.h&gt;</code><br>
 41 
<code>#include &lt;freetype2/ftglyph.h&gt;</code><br>
42 
<code>#include &lt;freetype/ftoutln.h&gt;</code><br>
 42 
<code>#include &lt;freetype2/ftoutln.h&gt;</code><br>
43 
<code>#include &lt;freetype/ftbbox.h&gt;</code><br>
 43 
<code>#include &lt;freetype2/ftbbox.h&gt;</code><br>
44 
<table border="0" cellpadding="0" cellspacing="0">
 44 
<table border="0" cellpadding="0" cellspacing="0">
45 
<tr><td></td></tr>
 45 
<tr><td></td></tr>
46 
<tr><td colspan="2"><br><h2>Defines</h2></td></tr>
 46 
<tr><td colspan="2"><br><h2>Defines</h2></td></tr>
(-)coders/jp2.c (+9 lines)
Lines 639-643 Link Here
639 

          639
          

        

        

          640
          
#if defined(HasJP2)

          640
          
#if defined(HasJP2)

        

            

              
              
              641
              

            

            

              642
              
#ifndef JAS_IMAGE_CM_GRAY

            

            

              643
              
#define JAS_IMAGE_CM_GRAY JAS_IMAGE_CS_GRAY

            

            

              644
              
#endif

            

            

              645
              

            

            

              646
              
#ifndef JAS_IMAGE_CM_RGB

            

            

              647
              
#define JAS_IMAGE_CM_RGB JAS_IMAGE_CS_RGB

            

            

              648
              
#endif

            

            

              649
              

            

        

          641
          
/*

          650
          
/*

        

        

          642
          
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

          651
          
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

        

        

          643
          
%                                                                             %

          652
          
%                                                                             %

        



(-)magick/config.h_vms
      (-1 / +1 lines)




  

    
      
            Lines 91-97
          
      
      
        Link Here
      
    
  

        

          91
          
/* Define if you have the <ft2build.h> header file.  */

          91
          
/* Define if you have the <ft2build.h> header file.  */

        

        

          92
          
#define MAGICKCORE_HAVE_FT2BUILD_H 1

          92
          
#define MAGICKCORE_HAVE_FT2BUILD_H 1

        

        

          93
          

          93
          

        

          
            

              94
              
/* Define if you have the <freetype/freetype.h> header file.  */


              94
              
/* Define if you have the <freetype2/freetype.h> header file.  */

            

        

          95
          
#define MAGICKCORE_HAVE_FREETYPE_FREETYPE_H 1

          95
          
#define MAGICKCORE_HAVE_FREETYPE_FREETYPE_H 1

        

        

          96
          

          96
          

        

        

          97
          
/* Define if you have the <hdf.h> header file.  */

          97
          
/* Define if you have the <hdf.h> header file.  */

        



(-)configure
      (-2 / +2 lines)




  

    
      
            Lines 28616-28622
          
      
      
        Link Here
      
    
  

        

          28616
          
fi

          28616
          
fi

        

        

          28617
          

          28617
          

        

        

          28618
          

          28618
          

        

          
            

              28619
              
    ac_fn_c_check_header_compile "$LINENO" "freetype/freetype.h" "ac_cv_header_freetype_freetype_h" "$FT2BUILD_H


              28619
              
    ac_fn_c_check_header_compile "$LINENO" "freetype2/freetype.h" "ac_cv_header_freetype_freetype_h" "$FT2BUILD_H

            

        

          28620
          
"

          28620
          
"

        

        

          28621
          
if test "x$ac_cv_header_freetype_freetype_h" = xyes; then :

          28621
          
if test "x$ac_cv_header_freetype_freetype_h" = xyes; then :

        

        

          28622
          
  have_freetype_h='yes'

          28622
          
  have_freetype_h='yes'

        

  

    
      
            Lines 31756-31762
          
      
      
        Link Here
      
    
  

        

          31756
          

          31756
          

        

        

          31757
          
#

          31757
          
#

        

        

          31758
          
# Path to ImageMagick documentation files

          31758
          
# Path to ImageMagick documentation files

        

          
            

              31759
              
DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"


              31759
              
DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}"

            

        

          31760
          
DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"

          31760
          
DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"

        

        

          31761
          
DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"

          31761
          
DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"

        

        

          31762
          
case "${build_os}" in

          31762
          
case "${build_os}" in

        



(-)configure.ac
      (-1 / +1 lines)




  

    
      
            Lines 1941-1947
          
      
      
        Link Here
      
    
  

        

          1941
          

          1941
          

        

        

          1942
          
dnl Now test for the headers

          1942
          
dnl Now test for the headers

        

        

          1943
          
    AC_CHECK_HEADER([ft2build.h],[FT2BUILD_H='#include <ft2build.h>'],[ft2build=''],[])

          1943
          
    AC_CHECK_HEADER([ft2build.h],[FT2BUILD_H='#include <ft2build.h>'],[ft2build=''],[])

        

          
            

              1944
              
    AC_CHECK_HEADER(freetype/freetype.h,[have_freetype_h='yes'],[have_freetype_h='no'],[$FT2BUILD_H])


              1944
              
    AC_CHECK_HEADER(freetype2/freetype.h,[have_freetype_h='yes'],[have_freetype_h='no'],[$FT2BUILD_H])

            

        

          1945
          
    if test "$have_freetype_h" = 'yes'; then

          1945
          
    if test "$have_freetype_h" = 'yes'; then

        

        

          1946
          
      passed=`expr $passed + 1`

          1946
          
      passed=`expr $passed + 1`

        

        

          1947
          
    else

          1947
          
    else

        



(-)coders/ttf.c
      (-1 / +1 lines)




  

    
      
            Lines 64-70
          
      
      
        Link Here
      
    
  

        

          64
          
#if defined(FT_FREETYPE_H)

          64
          
#if defined(FT_FREETYPE_H)

        

        

          65
          
#  include FT_FREETYPE_H

          65
          
#  include FT_FREETYPE_H

        

        

          66
          
#else

          66
          
#else

        

          
            

              67
              
#  include <freetype/freetype.h>


              67
              
#  include <freetype2/freetype.h>

            

        

          68
          
#endif

          68
          
#endif

        

        

          69
          
#endif

          69
          
#endif

        






  

  Return to bug 186171