Browse Source

Imported Upstream version 0.4.2

Bernd Zeimetz 5 years ago
parent
commit
991944b276
100 changed files with 9999 additions and 12769 deletions
  1. 7
    2
      Makefile.in
  2. 48
    28
      README.Windows
  3. 1510
    864
      aclocal.m4
  4. 247
    243
      config.guess
  5. 3
    0
      config.h.in
  6. 192
    77
      config.sub
  7. 5298
    6251
      configure
  8. 3
    3
      configure.ac
  9. 7
    7
      docs/liblqr_manual.docbook
  10. 1
    1
      examples/liquidrescale.cpp
  11. 3
    2
      install-sh
  12. 5
    1
      lqr/Makefile.in
  13. 7
    2
      lqr/lqr_carver.c
  14. 6
    9
      lqr/lqr_energy.c
  15. 11
    11
      lqr/lqr_energy_priv.h
  16. 1
    0
      lqr/lqr_rwindow.c
  17. 2645
    1396
      ltmain.sh
  18. 0
    74
      man/LqrColDepth.3
  19. 0
    61
      man/LqrImageType.3
  20. 0
    51
      man/LqrRetVal.3
  21. 5
    1
      man/Makefile.in
  22. 0
    66
      man/lqr_carver_attach.3
  23. 0
    1
      man/lqr_carver_bias_add.3
  24. 0
    1
      man/lqr_carver_bias_add_area.3
  25. 0
    1
      man/lqr_carver_bias_add_rgb.3
  26. 0
    1
      man/lqr_carver_bias_add_rgb_area.3
  27. 0
    125
      man/lqr_carver_bias_add_xy.3
  28. 0
    38
      man/lqr_carver_bias_clear.3
  29. 0
    160
      man/lqr_carver_bias_set_energy_function.3
  30. 0
    82
      man/lqr_carver_bias_set_energy_function_builtin.3
  31. 0
    58
      man/lqr_carver_cancel.3
  32. 0
    43
      man/lqr_carver_destroy.3
  33. 0
    58
      man/lqr_carver_flatten.3
  34. 0
    1
      man/lqr_carver_get_bpp.3
  35. 0
    45
      man/lqr_carver_get_channels.3
  36. 0
    38
      man/lqr_carver_get_col_depth.3
  37. 0
    38
      man/lqr_carver_get_depth.3
  38. 0
    123
      man/lqr_carver_get_energy.3
  39. 0
    1
      man/lqr_carver_get_energy_image.3
  40. 0
    38
      man/lqr_carver_get_enl_step.3
  41. 0
    38
      man/lqr_carver_get_height.3
  42. 0
    38
      man/lqr_carver_get_image_type.3
  43. 0
    42
      man/lqr_carver_get_orientation.3
  44. 0
    42
      man/lqr_carver_get_ref_height.3
  45. 0
    42
      man/lqr_carver_get_ref_width.3
  46. 0
    1
      man/lqr_carver_get_true_energy.3
  47. 0
    38
      man/lqr_carver_get_width.3
  48. 0
    54
      man/lqr_carver_init.3
  49. 0
    41
      man/lqr_carver_list_current.3
  50. 0
    96
      man/lqr_carver_list_foreach.3
  51. 0
    40
      man/lqr_carver_list_next.3
  52. 0
    54
      man/lqr_carver_list_start.3
  53. 0
    127
      man/lqr_carver_new.3
  54. 0
    1
      man/lqr_carver_new_ext.3
  55. 0
    55
      man/lqr_carver_resize.3
  56. 0
    1
      man/lqr_carver_rigmask_add.3
  57. 0
    1
      man/lqr_carver_rigmask_add_area.3
  58. 0
    1
      man/lqr_carver_rigmask_add_rgb.3
  59. 0
    1
      man/lqr_carver_rigmask_add_rgb_area.3
  60. 0
    131
      man/lqr_carver_rigmask_add_xy.3
  61. 0
    38
      man/lqr_carver_rigmask_clear.3
  62. 0
    76
      man/lqr_carver_scan.3
  63. 0
    49
      man/lqr_carver_scan_by_row.3
  64. 0
    1
      man/lqr_carver_scan_ext.3
  65. 0
    72
      man/lqr_carver_scan_line.3
  66. 0
    1
      man/lqr_carver_scan_line_ext.3
  67. 0
    39
      man/lqr_carver_scan_reset.3
  68. 0
    61
      man/lqr_carver_set_alpha_channel.3
  69. 0
    63
      man/lqr_carver_set_black_channel.3
  70. 0
    65
      man/lqr_carver_set_dump_vmaps.3
  71. 0
    59
      man/lqr_carver_set_enl_step.3
  72. 0
    81
      man/lqr_carver_set_gradient_function.3
  73. 0
    51
      man/lqr_carver_set_image_type.3
  74. 0
    1
      man/lqr_carver_set_no_dump_vmaps.3
  75. 0
    44
      man/lqr_carver_set_preserve_input_image.3
  76. 0
    43
      man/lqr_carver_set_progress.3
  77. 0
    51
      man/lqr_carver_set_resize_order.3
  78. 0
    56
      man/lqr_carver_set_side_switch_frequency.3
  79. 0
    40
      man/lqr_carver_set_use_cache.3
  80. 0
    60
      man/lqr_progress_new.3
  81. 0
    65
      man/lqr_progress_set_end.3
  82. 0
    50
      man/lqr_progress_set_end_height_message.3
  83. 0
    50
      man/lqr_progress_set_end_width_message.3
  84. 0
    81
      man/lqr_progress_set_init.3
  85. 0
    50
      man/lqr_progress_set_init_height_message.3
  86. 0
    50
      man/lqr_progress_set_init_width_message.3
  87. 0
    64
      man/lqr_progress_set_update.3
  88. 0
    53
      man/lqr_progress_set_update_step.3
  89. 0
    44
      man/lqr_rwindow_get_channels.3
  90. 0
    40
      man/lqr_rwindow_get_radius.3
  91. 0
    39
      man/lqr_rwindow_get_read_t.3
  92. 0
    81
      man/lqr_rwindow_read.3
  93. 0
    39
      man/lqr_vmap_destroy.3
  94. 0
    40
      man/lqr_vmap_dump.3
  95. 0
    50
      man/lqr_vmap_get_data.3
  96. 0
    43
      man/lqr_vmap_get_depth.3
  97. 0
    43
      man/lqr_vmap_get_height.3
  98. 0
    47
      man/lqr_vmap_get_orientation.3
  99. 0
    43
      man/lqr_vmap_get_width.3
  100. 0
    0
      man/lqr_vmap_internal_dump.3

+ 7
- 2
Makefile.in View File

@@ -143,6 +143,7 @@ MAINT = @MAINT@
143 143
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
144 144
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
145 145
 MAKEINFO = @MAKEINFO@
146
+MANIFEST_TOOL = @MANIFEST_TOOL@
146 147
 NM = @NM@
147 148
 NMEDIT = @NMEDIT@
148 149
 OBJDUMP = @OBJDUMP@
@@ -154,15 +155,19 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
154 155
 PACKAGE_NAME = @PACKAGE_NAME@
155 156
 PACKAGE_STRING = @PACKAGE_STRING@
156 157
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
158
+PACKAGE_URL = @PACKAGE_URL@
157 159
 PACKAGE_VERSION = @PACKAGE_VERSION@
158 160
 PATH_SEPARATOR = @PATH_SEPARATOR@
159 161
 PKG_CONFIG = @PKG_CONFIG@
162
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
163
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
160 164
 RANLIB = @RANLIB@
161 165
 SED = @SED@
162 166
 SET_MAKE = @SET_MAKE@
163 167
 SHELL = @SHELL@
164 168
 STRIP = @STRIP@
165 169
 VERSION = @VERSION@
170
+ac_ct_AR = @ac_ct_AR@
166 171
 ac_ct_CC = @ac_ct_CC@
167 172
 ac_ct_CXX = @ac_ct_CXX@
168 173
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -199,7 +204,6 @@ libdir = @libdir@
199 204
 libexecdir = @libexecdir@
200 205
 localedir = @localedir@
201 206
 localstatedir = @localstatedir@
202
-lt_ECHO = @lt_ECHO@
203 207
 mandir = @mandir@
204 208
 mkdir_p = @mkdir_p@
205 209
 oldincludedir = @oldincludedir@
@@ -495,7 +499,8 @@ distdir: $(DISTFILES)
495 499
 	      || exit 1; \
496 500
 	  fi; \
497 501
 	done
498
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
502
+	-find "$(distdir)" -type d ! -perm -755 \
503
+		-exec chmod u+rwx,go+rx {} \; -o \
499 504
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
500 505
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
501 506
 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \

+ 48
- 28
README.Windows View File

@@ -19,34 +19,54 @@ against the static library.
19 19
 
20 20
 2) Using MS Visual C++
21 21
 
22
-The library compiles at least under `Microsoft Visual C++
23
-2008 Express edition'. You can create an empty DLL project
24
-with the default setup (choose Console Application then
25
-Advanced Settings -> DLL + Empty Project), then put the
26
-`lqr' directory in the project directory and add all of the
27
-files within that dir to the project with `Add Exisitng
28
-Item'.  Then, you must modify the project properties like
29
-this:
30
-
31
-  a) C/C++ -> General -> Additional Include Directories: add
32
-  the directory `lqr' and its parent, and also the directory
33
-  where all the necessary glib-2.0 headers are found.
34
-
35
-  b) C/C++ -> Preprocessor -> Preprocessor Definitions: add
36
-  LQR_EXPORT to the list
37
-
38
-  c) C/C++ -> Advanced -> Compile As: Compile as C Code (it
39
-  also works otherwise, but this option seems to make sense
40
-  given that the library is ANSI C)
41
-
42
-  d) Linker -> General -> Version: set version (don't know
43
-  if this is really needed or has any purpose at all though)
44
-
45
-  e) Linker -> Additional Library Directories: add the
46
-  directory where glib-2.0.lib is found
47
-
48
-  f) Linker -> Input -> Additional Dependencies: add
49
-  glib-2.0.lib
22
+The library compiles with `Microsoft Visual C++ 2008 Express
23
+edition' and `Microsoft Visual C++ 2010 Express Edition'.
24
+Follow these steps:
25
+
26
+  a) Create a new project (suggested name: `liblqr-1-0')
27
+  
28
+   *) In the 2008 edition, create an empty DLL project with
29
+      the default setup (choose Console Application then
30
+      Advanced Settings -> DLL + Empty Project). The
31
+      suggested name is liblr-1-0
32
+   
33
+   *) In the 2010 edition, choose Empty project
34
+
35
+  b) Copy the `lqr' directory in the project directory you
36
+  have created
37
+
38
+  c) Add all the source files within the `lqr' directory to
39
+  the project (right-click -> Add -> Existing item...)
40
+   
41
+  d) Go to Project -> Properties in the menu. This opens a
42
+  dialog. At the top, set "Configuration:" to "All
43
+  Configurations". Then, go to "Configuration Properties"
44
+  and set the options as follows:
45
+  
46
+   *) [2010 edition only] General -> Configuration Type:
47
+      Dynamic Library
48
+
49
+   *) C/C++ -> General -> Additional Include Directories:
50
+      add the directory `lqr' and its parent, and also the
51
+      directory where all the necessary glib-2.0 headers are
52
+      found (usually, there are 2 of those, one ends with
53
+      `include\glib-2.0', another with
54
+      `lib\glib-2.0\include')
55
+
56
+   *) C/C++ -> Preprocessor -> Preprocessor Definitions: add
57
+      LQR_EXPORTS to the list
58
+
59
+   *) C/C++ -> Advanced -> Compile As: Compile as C Code (it
60
+      also works otherwise, but this option seems to make
61
+      sense given that the library is ANSI C)
62
+
63
+   *) Linker -> General -> Version: set version number
64
+
65
+   *) Linker -> General -> Additional Library Directories:
66
+      add the directory where glib-2.0.lib is found
67
+
68
+   *) Linker -> Input -> Additional Dependencies: add
69
+      glib-2.0.lib
50 70
 
51 71
 When you build the project, it should produce the library
52 72
 liblqr-1-0.lib and liblqr-1-0.dll files (assuming your

+ 1510
- 864
aclocal.m4
File diff suppressed because it is too large
View File


+ 247
- 243
config.guess View File

@@ -1,10 +1,10 @@
1 1
 #! /bin/sh
2 2
 # Attempt to guess a canonical system name.
3 3
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
5
-#   Free Software Foundation, Inc.
4
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5
+#   2011, 2012 Free Software Foundation, Inc.
6 6
 
7
-timestamp='2008-01-23'
7
+timestamp='2012-02-10'
8 8
 
9 9
 # This file is free software; you can redistribute it and/or modify it
10 10
 # under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@ timestamp='2008-01-23'
17 17
 # General Public License for more details.
18 18
 #
19 19
 # You should have received a copy of the GNU General Public License
20
-# along with this program; if not, write to the Free Software
21
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
22
-# 02110-1301, USA.
20
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
23 21
 #
24 22
 # As a special exception to the GNU General Public License, if you
25 23
 # distribute this file as part of a program that contains a
@@ -27,16 +25,16 @@ timestamp='2008-01-23'
27 25
 # the same distribution terms that you use for the rest of that program.
28 26
 
29 27
 
30
-# Originally written by Per Bothner <per@bothner.com>.
31
-# Please send patches to <config-patches@gnu.org>.  Submit a context
32
-# diff and a properly formatted ChangeLog entry.
28
+# Originally written by Per Bothner.  Please send patches (context
29
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
30
+# entry.
33 31
 #
34 32
 # This script attempts to guess a canonical system name similar to
35 33
 # config.sub.  If it succeeds, it prints the system name on stdout, and
36 34
 # exits with 0.  Otherwise, it exits with 1.
37 35
 #
38
-# The plan is that this can be called by configure scripts if you
39
-# don't specify an explicit build system type.
36
+# You can get the latest version of this script from:
37
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
40 38
 
41 39
 me=`echo "$0" | sed -e 's,.*/,,'`
42 40
 
@@ -56,8 +54,9 @@ version="\
56 54
 GNU config.guess ($timestamp)
57 55
 
58 56
 Originally written by Per Bothner.
59
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
60
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
57
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
58
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
59
+Free Software Foundation, Inc.
61 60
 
62 61
 This is free software; see the source for copying conditions.  There is NO
63 62
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -144,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
144 143
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
145 144
     *:NetBSD:*:*)
146 145
 	# NetBSD (nbsd) targets should (where applicable) match one or
147
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
146
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
148 147
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
149 148
 	# switched to ELF, *-*-netbsd* would select the old
150 149
 	# object file format.  This provides both forward
@@ -170,7 +169,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
170 169
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
171 170
 		eval $set_cc_for_build
172 171
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
173
-			| grep __ELF__ >/dev/null
172
+			| grep -q __ELF__
174 173
 		then
175 174
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
176 175
 		    # Return netbsd for either.  FIX?
@@ -180,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
180 179
 		fi
181 180
 		;;
182 181
 	    *)
183
-	        os=netbsd
182
+		os=netbsd
184 183
 		;;
185 184
 	esac
186 185
 	# The OS release
@@ -223,7 +222,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
223 222
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
224 223
 		;;
225 224
 	*5.*)
226
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
225
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
227 226
 		;;
228 227
 	esac
229 228
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +268,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
269 268
 	# A Xn.n version is an unreleased experimental baselevel.
270 269
 	# 1.2 uses "1.2" for uname -r.
271 270
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
272
-	exit ;;
271
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
272
+	exitcode=$?
273
+	trap '' 0
274
+	exit $exitcode ;;
273 275
     Alpha\ *:Windows_NT*:*)
274 276
 	# How do we know it's Interix rather than the generic POSIX subsystem?
275 277
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,7 +297,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
295 297
 	echo s390-ibm-zvmoe
296 298
 	exit ;;
297 299
     *:OS400:*:*)
298
-        echo powerpc-ibm-os400
300
+	echo powerpc-ibm-os400
299 301
 	exit ;;
300 302
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
301 303
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -324,14 +326,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
324 326
 	case `/usr/bin/uname -p` in
325 327
 	    sparc) echo sparc-icl-nx7; exit ;;
326 328
 	esac ;;
329
+    s390x:SunOS:*:*)
330
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
331
+	exit ;;
327 332
     sun4H:SunOS:5.*:*)
328 333
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
329 334
 	exit ;;
330 335
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
331 336
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
332 337
 	exit ;;
338
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
339
+	echo i386-pc-auroraux${UNAME_RELEASE}
340
+	exit ;;
333 341
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
334
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
342
+	eval $set_cc_for_build
343
+	SUN_ARCH="i386"
344
+	# If there is a compiler, see if it is configured for 64-bit objects.
345
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
346
+	# This test works for both compilers.
347
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
348
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
349
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
350
+		grep IS_64BIT_ARCH >/dev/null
351
+	    then
352
+		SUN_ARCH="x86_64"
353
+	    fi
354
+	fi
355
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
335 356
 	exit ;;
336 357
     sun4*:SunOS:6*:*)
337 358
 	# According to config.sub, this is the proper way to canonicalize
@@ -375,23 +396,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
375 396
     # MiNT.  But MiNT is downward compatible to TOS, so this should
376 397
     # be no problem.
377 398
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
378
-        echo m68k-atari-mint${UNAME_RELEASE}
399
+	echo m68k-atari-mint${UNAME_RELEASE}
379 400
 	exit ;;
380 401
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
381 402
 	echo m68k-atari-mint${UNAME_RELEASE}
382
-        exit ;;
403
+	exit ;;
383 404
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
384
-        echo m68k-atari-mint${UNAME_RELEASE}
405
+	echo m68k-atari-mint${UNAME_RELEASE}
385 406
 	exit ;;
386 407
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
387
-        echo m68k-milan-mint${UNAME_RELEASE}
388
-        exit ;;
408
+	echo m68k-milan-mint${UNAME_RELEASE}
409
+	exit ;;
389 410
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
390
-        echo m68k-hades-mint${UNAME_RELEASE}
391
-        exit ;;
411
+	echo m68k-hades-mint${UNAME_RELEASE}
412
+	exit ;;
392 413
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
393
-        echo m68k-unknown-mint${UNAME_RELEASE}
394
-        exit ;;
414
+	echo m68k-unknown-mint${UNAME_RELEASE}
415
+	exit ;;
395 416
     m68k:machten:*:*)
396 417
 	echo m68k-apple-machten${UNAME_RELEASE}
397 418
 	exit ;;
@@ -461,8 +482,8 @@ EOF
461 482
 	echo m88k-motorola-sysv3
462 483
 	exit ;;
463 484
     AViiON:dgux:*:*)
464
-        # DG/UX returns AViiON for all architectures
465
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
485
+	# DG/UX returns AViiON for all architectures
486
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
466 487
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
467 488
 	then
468 489
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -475,7 +496,7 @@ EOF
475 496
 	else
476 497
 	    echo i586-dg-dgux${UNAME_RELEASE}
477 498
 	fi
478
- 	exit ;;
499
+	exit ;;
479 500
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
480 501
 	echo m88k-dolphin-sysv3
481 502
 	exit ;;
@@ -532,7 +553,7 @@ EOF
532 553
 		echo rs6000-ibm-aix3.2
533 554
 	fi
534 555
 	exit ;;
535
-    *:AIX:*:[456])
556
+    *:AIX:*:[4567])
536 557
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
537 558
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
538 559
 		IBM_ARCH=rs6000
@@ -575,52 +596,52 @@ EOF
575 596
 	    9000/[678][0-9][0-9])
576 597
 		if [ -x /usr/bin/getconf ]; then
577 598
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
578
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
579
-                    case "${sc_cpu_version}" in
580
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
581
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
582
-                      532)                      # CPU_PA_RISC2_0
583
-                        case "${sc_kernel_bits}" in
584
-                          32) HP_ARCH="hppa2.0n" ;;
585
-                          64) HP_ARCH="hppa2.0w" ;;
599
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
600
+		    case "${sc_cpu_version}" in
601
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
602
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
603
+		      532)                      # CPU_PA_RISC2_0
604
+			case "${sc_kernel_bits}" in
605
+			  32) HP_ARCH="hppa2.0n" ;;
606
+			  64) HP_ARCH="hppa2.0w" ;;
586 607
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
587
-                        esac ;;
588
-                    esac
608
+			esac ;;
609
+		    esac
589 610
 		fi
590 611
 		if [ "${HP_ARCH}" = "" ]; then
591 612
 		    eval $set_cc_for_build
592
-		    sed 's/^              //' << EOF >$dummy.c
613
+		    sed 's/^		//' << EOF >$dummy.c
593 614
 
594
-              #define _HPUX_SOURCE
595
-              #include <stdlib.h>
596
-              #include <unistd.h>
615
+		#define _HPUX_SOURCE
616
+		#include <stdlib.h>
617
+		#include <unistd.h>
597 618
 
598
-              int main ()
599
-              {
600
-              #if defined(_SC_KERNEL_BITS)
601
-                  long bits = sysconf(_SC_KERNEL_BITS);
602
-              #endif
603
-                  long cpu  = sysconf (_SC_CPU_VERSION);
619
+		int main ()
620
+		{
621
+		#if defined(_SC_KERNEL_BITS)
622
+		    long bits = sysconf(_SC_KERNEL_BITS);
623
+		#endif
624
+		    long cpu  = sysconf (_SC_CPU_VERSION);
604 625
 
605
-                  switch (cpu)
606
-              	{
607
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
608
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
609
-              	case CPU_PA_RISC2_0:
610
-              #if defined(_SC_KERNEL_BITS)
611
-              	    switch (bits)
612
-              		{
613
-              		case 64: puts ("hppa2.0w"); break;
614
-              		case 32: puts ("hppa2.0n"); break;
615
-              		default: puts ("hppa2.0"); break;
616
-              		} break;
617
-              #else  /* !defined(_SC_KERNEL_BITS) */
618
-              	    puts ("hppa2.0"); break;
619
-              #endif
620
-              	default: puts ("hppa1.0"); break;
621
-              	}
622
-                  exit (0);
623
-              }
626
+		    switch (cpu)
627
+			{
628
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
629
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
630
+			case CPU_PA_RISC2_0:
631
+		#if defined(_SC_KERNEL_BITS)
632
+			    switch (bits)
633
+				{
634
+				case 64: puts ("hppa2.0w"); break;
635
+				case 32: puts ("hppa2.0n"); break;
636
+				default: puts ("hppa2.0"); break;
637
+				} break;
638
+		#else  /* !defined(_SC_KERNEL_BITS) */
639
+			    puts ("hppa2.0"); break;
640
+		#endif
641
+			default: puts ("hppa1.0"); break;
642
+			}
643
+		    exit (0);
644
+		}
624 645
 EOF
625 646
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
626 647
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -640,7 +661,7 @@ EOF
640 661
 	    # => hppa64-hp-hpux11.23
641 662
 
642 663
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
643
-		grep __LP64__ >/dev/null
664
+		grep -q __LP64__
644 665
 	    then
645 666
 		HP_ARCH="hppa2.0w"
646 667
 	    else
@@ -711,22 +732,22 @@ EOF
711 732
 	exit ;;
712 733
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
713 734
 	echo c1-convex-bsd
714
-        exit ;;
735
+	exit ;;
715 736
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
716 737
 	if getsysinfo -f scalar_acc
717 738
 	then echo c32-convex-bsd
718 739
 	else echo c2-convex-bsd
719 740
 	fi
720
-        exit ;;
741
+	exit ;;
721 742
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
722 743
 	echo c34-convex-bsd
723
-        exit ;;
744
+	exit ;;
724 745
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
725 746
 	echo c38-convex-bsd
726
-        exit ;;
747
+	exit ;;
727 748
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
728 749
 	echo c4-convex-bsd
729
-        exit ;;
750
+	exit ;;
730 751
     CRAY*Y-MP:*:*:*)
731 752
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
732 753
 	exit ;;
@@ -750,14 +771,14 @@ EOF
750 771
 	exit ;;
751 772
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
752 773
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
753
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
754
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
755
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
756
-        exit ;;
774
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
775
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
776
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
777
+	exit ;;
757 778
     5000:UNIX_System_V:4.*:*)
758
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
759
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
760
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
779
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
780
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
781
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
761 782
 	exit ;;
762 783
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
763 784
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -769,13 +790,12 @@ EOF
769 790
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
770 791
 	exit ;;
771 792
     *:FreeBSD:*:*)
772
-	case ${UNAME_MACHINE} in
773
-	    pc98)
774
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
793
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
794
+	case ${UNAME_PROCESSOR} in
775 795
 	    amd64)
776 796
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
777 797
 	    *)
778
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
798
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
779 799
 	esac
780 800
 	exit ;;
781 801
     i*:CYGWIN*:*)
@@ -784,19 +804,22 @@ EOF
784 804
     *:MINGW*:*)
785 805
 	echo ${UNAME_MACHINE}-pc-mingw32
786 806
 	exit ;;
807
+    i*:MSYS*:*)
808
+	echo ${UNAME_MACHINE}-pc-msys
809
+	exit ;;
787 810
     i*:windows32*:*)
788
-    	# uname -m includes "-pc" on this system.
789
-    	echo ${UNAME_MACHINE}-mingw32
811
+	# uname -m includes "-pc" on this system.
812
+	echo ${UNAME_MACHINE}-mingw32
790 813
 	exit ;;
791 814
     i*:PW*:*)
792 815
 	echo ${UNAME_MACHINE}-pc-pw32
793 816
 	exit ;;
794
-    *:Interix*:[3456]*)
795
-    	case ${UNAME_MACHINE} in
817
+    *:Interix*:*)
818
+	case ${UNAME_MACHINE} in
796 819
 	    x86)
797 820
 		echo i586-pc-interix${UNAME_RELEASE}
798 821
 		exit ;;
799
-	    EM64T | authenticamd)
822
+	    authenticamd | genuineintel | EM64T)
800 823
 		echo x86_64-unknown-interix${UNAME_RELEASE}
801 824
 		exit ;;
802 825
 	    IA64)
@@ -806,6 +829,9 @@ EOF
806 829
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
807 830
 	echo i${UNAME_MACHINE}-pc-mks
808 831
 	exit ;;
832
+    8664:Windows_NT:*)
833
+	echo x86_64-pc-mks
834
+	exit ;;
809 835
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
810 836
 	# How do we know it's Interix rather than the generic POSIX subsystem?
811 837
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -835,6 +861,27 @@ EOF
835 861
     i*86:Minix:*:*)
836 862
 	echo ${UNAME_MACHINE}-pc-minix
837 863
 	exit ;;
864
+    aarch64:Linux:*:*)
865
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
866
+	exit ;;
867
+    aarch64_be:Linux:*:*)
868
+	UNAME_MACHINE=aarch64_be
869
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
870
+	exit ;;
871
+    alpha:Linux:*:*)
872
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
873
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
874
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
875
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
876
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
877
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
878
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
879
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
880
+	esac
881
+	objdump --private-headers /bin/sh | grep -q ld.so.1
882
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
883
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
884
+	exit ;;
838 885
     arm*:Linux:*:*)
839 886
 	eval $set_cc_for_build
840 887
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -842,20 +889,40 @@ EOF
842 889
 	then
843 890
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
844 891
 	else
845
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
892
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
893
+		| grep -q __ARM_PCS_VFP
894
+	    then
895
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
896
+	    else
897
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
898
+	    fi
846 899
 	fi
847 900
 	exit ;;
848 901
     avr32*:Linux:*:*)
849 902
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
850 903
 	exit ;;
851 904
     cris:Linux:*:*)
852
-	echo cris-axis-linux-gnu
905
+	echo ${UNAME_MACHINE}-axis-linux-gnu
853 906
 	exit ;;
854 907
     crisv32:Linux:*:*)
855
-	echo crisv32-axis-linux-gnu
908
+	echo ${UNAME_MACHINE}-axis-linux-gnu
856 909
 	exit ;;
857 910
     frv:Linux:*:*)
858
-    	echo frv-unknown-linux-gnu
911
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
912
+	exit ;;
913
+    hexagon:Linux:*:*)
914
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
915
+	exit ;;
916
+    i*86:Linux:*:*)
917
+	LIBC=gnu
918
+	eval $set_cc_for_build
919
+	sed 's/^	//' << EOF >$dummy.c
920
+	#ifdef __dietlibc__
921
+	LIBC=dietlibc
922
+	#endif
923
+EOF
924
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
925
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
859 926
 	exit ;;
860 927
     ia64:Linux:*:*)
861 928
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -866,74 +933,33 @@ EOF
866 933
     m68*:Linux:*:*)
867 934
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
868 935
 	exit ;;
869
-    mips:Linux:*:*)
936
+    mips:Linux:*:* | mips64:Linux:*:*)
870 937
 	eval $set_cc_for_build
871 938
 	sed 's/^	//' << EOF >$dummy.c
872 939
 	#undef CPU
873
-	#undef mips
874
-	#undef mipsel
940
+	#undef ${UNAME_MACHINE}
941
+	#undef ${UNAME_MACHINE}el
875 942
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
876
-	CPU=mipsel
943
+	CPU=${UNAME_MACHINE}el
877 944
 	#else
878 945
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
879
-	CPU=mips
946
+	CPU=${UNAME_MACHINE}
880 947
 	#else
881 948
 	CPU=
882 949
 	#endif
883 950
 	#endif
884 951
 EOF
885
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
886
-	    /^CPU/{
887
-		s: ::g
888
-		p
889
-	    }'`"
890
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
891
-	;;
892
-    mips64:Linux:*:*)
893
-	eval $set_cc_for_build
894
-	sed 's/^	//' << EOF >$dummy.c
895
-	#undef CPU
896
-	#undef mips64
897
-	#undef mips64el
898
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
899
-	CPU=mips64el
900
-	#else
901
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
902
-	CPU=mips64
903
-	#else
904
-	CPU=
905
-	#endif
906
-	#endif
907
-EOF
908
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
909
-	    /^CPU/{
910
-		s: ::g
911
-		p
912
-	    }'`"
952
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
913 953
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
914 954
 	;;
915 955
     or32:Linux:*:*)
916
-	echo or32-unknown-linux-gnu
956
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
917 957
 	exit ;;
918
-    ppc:Linux:*:*)
919
-	echo powerpc-unknown-linux-gnu
958
+    padre:Linux:*:*)
959
+	echo sparc-unknown-linux-gnu
920 960
 	exit ;;
921
-    ppc64:Linux:*:*)
922
-	echo powerpc64-unknown-linux-gnu
923
-	exit ;;
924
-    alpha:Linux:*:*)
925
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
926
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
927
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
928
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
929
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
930
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
931
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
932
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
933
-        esac
934
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
935
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
936
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
961
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
962
+	echo hppa64-unknown-linux-gnu
937 963
 	exit ;;
938 964
     parisc:Linux:*:* | hppa:Linux:*:*)
939 965
 	# Look for CPU level
@@ -943,14 +969,17 @@ EOF
943 969
 	  *)    echo hppa-unknown-linux-gnu ;;
944 970
 	esac
945 971
 	exit ;;
946
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
947
-	echo hppa64-unknown-linux-gnu
972
+    ppc64:Linux:*:*)
973
+	echo powerpc64-unknown-linux-gnu
974
+	exit ;;
975
+    ppc:Linux:*:*)
976
+	echo powerpc-unknown-linux-gnu
948 977
 	exit ;;
949 978
     s390:Linux:*:* | s390x:Linux:*:*)
950 979
 	echo ${UNAME_MACHINE}-ibm-linux
951 980
 	exit ;;
952 981
     sh64*:Linux:*:*)
953
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
982
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
954 983
 	exit ;;
955 984
     sh*:Linux:*:*)
956 985
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -958,78 +987,18 @@ EOF
958 987
     sparc:Linux:*:* | sparc64:Linux:*:*)
959 988
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
960 989
 	exit ;;
990
+    tile*:Linux:*:*)
991
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
992
+	exit ;;
961 993
     vax:Linux:*:*)
962 994
 	echo ${UNAME_MACHINE}-dec-linux-gnu
963 995
 	exit ;;
964 996
     x86_64:Linux:*:*)
965
-	echo x86_64-unknown-linux-gnu
997
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
966 998
 	exit ;;
967 999
     xtensa*:Linux:*:*)
968
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
1000
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
969 1001
 	exit ;;
970
-    i*86:Linux:*:*)
971
-	# The BFD linker knows what the default object file format is, so
972
-	# first see if it will tell us. cd to the root directory to prevent
973
-	# problems with other programs or directories called `ld' in the path.
974
-	# Set LC_ALL=C to ensure ld outputs messages in English.
975
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
976
-			 | sed -ne '/supported targets:/!d
977
-				    s/[ 	][ 	]*/ /g
978
-				    s/.*supported targets: *//
979
-				    s/ .*//
980
-				    p'`
981
-        case "$ld_supported_targets" in
982
-	  elf32-i386)
983
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
984
-		;;
985
-	  a.out-i386-linux)
986
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
987
-		exit ;;
988
-	  coff-i386)
989
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
990
-		exit ;;
991
-	  "")
992
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
993
-		# one that does not give us useful --help.
994
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
995
-		exit ;;
996
-	esac
997
-	# Determine whether the default compiler is a.out or elf
998
-	eval $set_cc_for_build
999
-	sed 's/^	//' << EOF >$dummy.c
1000
-	#include <features.h>
1001
-	#ifdef __ELF__
1002
-	# ifdef __GLIBC__
1003
-	#  if __GLIBC__ >= 2
1004
-	LIBC=gnu
1005
-	#  else
1006
-	LIBC=gnulibc1
1007
-	#  endif
1008
-	# else
1009
-	LIBC=gnulibc1
1010
-	# endif
1011
-	#else
1012
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
1013
-	LIBC=gnu
1014
-	#else
1015
-	LIBC=gnuaout
1016
-	#endif
1017
-	#endif
1018
-	#ifdef __dietlibc__
1019
-	LIBC=dietlibc
1020
-	#endif
1021
-EOF
1022
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
1023
-	    /^LIBC/{
1024
-		s: ::g
1025
-		p
1026
-	    }'`"
1027
-	test x"${LIBC}" != x && {
1028
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
1029
-		exit
1030
-	}
1031
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
1032
-	;;
1033 1002
     i*86:DYNIX/ptx:4*:*)
1034 1003
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
1035 1004
 	# earlier versions are messed up and put the nodename in both
@@ -1037,11 +1006,11 @@ EOF
1037 1006
 	echo i386-sequent-sysv4
1038 1007
 	exit ;;
1039 1008
     i*86:UNIX_SV:4.2MP:2.*)
1040
-        # Unixware is an offshoot of SVR4, but it has its own version
1041
-        # number series starting with 2...
1042
-        # I am not positive that other SVR4 systems won't match this,
1009
+	# Unixware is an offshoot of SVR4, but it has its own version
1010
+	# number series starting with 2...
1011
+	# I am not positive that other SVR4 systems won't match this,
1043 1012
 	# I just have to hope.  -- rms.
1044
-        # Use sysv4.2uw... so that sysv4* matches it.
1013
+	# Use sysv4.2uw... so that sysv4* matches it.
1045 1014
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
1046 1015
 	exit ;;
1047 1016
     i*86:OS/2:*:*)
@@ -1058,7 +1027,7 @@ EOF
1058 1027
     i*86:syllable:*:*)
1059 1028
 	echo ${UNAME_MACHINE}-pc-syllable
1060 1029
 	exit ;;
1061
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
1030
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
1062 1031
 	echo i386-unknown-lynxos${UNAME_RELEASE}
1063 1032
 	exit ;;
1064 1033
     i*86:*DOS:*:*)
@@ -1073,7 +1042,7 @@ EOF
1073 1042
 	fi
1074 1043
 	exit ;;
1075 1044
     i*86:*:5:[678]*)
1076
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
1045
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
1077 1046
 	case `/bin/uname -X | grep "^Machine"` in
1078 1047
 	    *486*)	     UNAME_MACHINE=i486 ;;
1079 1048
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1101,10 +1070,13 @@ EOF
1101 1070
 	exit ;;
1102 1071
     pc:*:*:*)
1103 1072
 	# Left here for compatibility:
1104
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
1105
-        # the processor, so we play safe by assuming i386.
1106
-	echo i386-pc-msdosdjgpp
1107
-        exit ;;
1073
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
1074
+	# the processor, so we play safe by assuming i586.
1075
+	# Note: whatever this is, it MUST be the same as what config.sub
1076
+	# prints for the "djgpp" host, or else GDB configury will decide that
1077
+	# this is a cross-build.
1078
+	echo i586-pc-msdosdjgpp
1079
+	exit ;;
1108 1080
     Intel:Mach:3*:*)
1109 1081
 	echo i386-pc-mach3
1110 1082
 	exit ;;
@@ -1139,8 +1111,18 @@ EOF
1139 1111
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1140 1112
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1141 1113
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1142
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1143
-          && { echo i486-ncr-sysv4; exit; } ;;
1114
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1115
+	  && { echo i486-ncr-sysv4; exit; } ;;
1116
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
1117
+	OS_REL='.3'
1118
+	test -r /etc/.relid \
1119
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1120
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1121
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1122
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1123
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
1124
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
1125
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1144 1126
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
1145 1127
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
1146 1128
 	exit ;;
@@ -1153,7 +1135,7 @@ EOF
1153 1135
     rs6000:LynxOS:2.*:*)
1154 1136
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
1155 1137
 	exit ;;
1156
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
1138
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
1157 1139
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
1158 1140
 	exit ;;
1159 1141
     SM[BE]S:UNIX_SV:*:*)
@@ -1173,10 +1155,10 @@ EOF
1173 1155
 		echo ns32k-sni-sysv
1174 1156
 	fi
1175 1157
 	exit ;;
1176
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1177
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
1178
-        echo i586-unisys-sysv4
1179
-        exit ;;
1158
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
1159
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
1160
+	echo i586-unisys-sysv4
1161
+	exit ;;
1180 1162
     *:UNIX_System_V:4*:FTX*)
1181 1163
 	# From Gerald Hewes <hewes@openmarket.com>.
1182 1164
 	# How about differentiating between stratus architectures? -djm
@@ -1202,11 +1184,11 @@ EOF
1202 1184
 	exit ;;
1203 1185
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
1204 1186
 	if [ -d /usr/nec ]; then
1205
-	        echo mips-nec-sysv${UNAME_RELEASE}
1187
+		echo mips-nec-sysv${UNAME_RELEASE}
1206 1188
 	else
1207
-	        echo mips-unknown-sysv${UNAME_RELEASE}
1189
+		echo mips-unknown-sysv${UNAME_RELEASE}
1208 1190
 	fi
1209
-        exit ;;
1191
+	exit ;;
1210 1192
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
1211 1193
 	echo powerpc-be-beos
1212 1194
 	exit ;;
@@ -1216,6 +1198,9 @@ EOF
1216 1198
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
1217 1199
 	echo i586-pc-beos
1218 1200
 	exit ;;
1201
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
1202
+	echo i586-pc-haiku
1203
+	exit ;;
1219 1204
     SX-4:SUPER-UX:*:*)
1220 1205
 	echo sx4-nec-superux${UNAME_RELEASE}
1221 1206
 	exit ;;
@@ -1243,6 +1228,16 @@ EOF
1243 1228
     *:Darwin:*:*)
1244 1229
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1245 1230
 	case $UNAME_PROCESSOR in
1231
+	    i386)
1232
+		eval $set_cc_for_build
1233
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
1234
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
1235
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
1236
+		      grep IS_64BIT_ARCH >/dev/null
1237
+		  then
1238
+		      UNAME_PROCESSOR="x86_64"
1239
+		  fi
1240
+		fi ;;
1246 1241
 	    unknown) UNAME_PROCESSOR=powerpc ;;
1247 1242
 	esac
1248 1243
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1258,6 +1253,9 @@ EOF
1258 1253
     *:QNX:*:4*)
1259 1254
 	echo i386-pc-qnx
1260 1255
 	exit ;;
1256
+    NEO-?:NONSTOP_KERNEL:*:*)
1257
+	echo neo-tandem-nsk${UNAME_RELEASE}
1258
+	exit ;;
1261 1259
     NSE-?:NONSTOP_KERNEL:*:*)
1262 1260
 	echo nse-tandem-nsk${UNAME_RELEASE}
1263 1261
 	exit ;;
@@ -1303,13 +1301,13 @@ EOF
1303 1301
 	echo pdp10-unknown-its
1304 1302
 	exit ;;
1305 1303
     SEI:*:*:SEIUX)
1306
-        echo mips-sei-seiux${UNAME_RELEASE}
1304
+	echo mips-sei-seiux${UNAME_RELEASE}
1307 1305
 	exit ;;
1308 1306
     *:DragonFly:*:*)
1309 1307
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1310 1308
 	exit ;;
1311 1309
     *:*VMS:*:*)
1312
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
1310
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
1313 1311
 	case "${UNAME_MACHINE}" in
1314 1312
 	    A*) echo alpha-dec-vms ; exit ;;
1315 1313
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1324,6 +1322,12 @@ EOF
1324 1322
     i*86:rdos:*:*)
1325 1323
 	echo ${UNAME_MACHINE}-pc-rdos
1326 1324
 	exit ;;
1325
+    i*86:AROS:*:*)
1326
+	echo ${UNAME_MACHINE}-pc-aros
1327
+	exit ;;
1328
+    x86_64:VMkernel:*:*)
1329
+	echo ${UNAME_MACHINE}-unknown-esx
1330
+	exit ;;
1327 1331
 esac
1328 1332
 
1329 1333
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1346,11 +1350,11 @@ main ()
1346 1350
 #include <sys/param.h>
1347 1351
   printf ("m68k-sony-newsos%s\n",
1348 1352
 #ifdef NEWSOS4
1349
-          "4"
1353
+	"4"
1350 1354
 #else
1351
-	  ""
1355
+	""
1352 1356
 #endif
1353
-         ); exit (0);
1357
+	); exit (0);
1354 1358
 #endif
1355 1359
 #endif
1356 1360
 

+ 3
- 0
config.h.in View File

@@ -82,6 +82,9 @@
82 82
 /* Define to the one symbol short name of this package. */
83 83
 #undef PACKAGE_TARNAME
84 84
 
85
+/* Define to the home page for this package. */
86
+#undef PACKAGE_URL
87
+
85 88
 /* Define to the version of this package. */
86 89
 #undef PACKAGE_VERSION
87 90
 

+ 192
- 77
config.sub View File

@@ -1,10 +1,10 @@
1 1
 #! /bin/sh
2 2
 # Configuration validation subroutine script.
3 3
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
5
-#   Free Software Foundation, Inc.
4
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5
+#   2011, 2012 Free Software Foundation, Inc.
6 6
 
7
-timestamp='2008-01-16'
7
+timestamp='2012-02-10'
8 8
 
9 9
 # This file is (in principle) common to ALL GNU software.
10 10
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@ timestamp='2008-01-16'
21 21
 # GNU General Public License for more details.
22 22
 #
23 23
 # You should have received a copy of the GNU General Public License
24
-# along with this program; if not, write to the Free Software
25
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
26
-# 02110-1301, USA.
24
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
27 25
 #
28 26
 # As a special exception to the GNU General Public License, if you
29 27
 # distribute this file as part of a program that contains a
@@ -32,13 +30,16 @@ timestamp='2008-01-16'
32 30
 
33 31
 
34 32
 # Please send patches to <config-patches@gnu.org>.  Submit a context
35
-# diff and a properly formatted ChangeLog entry.
33
+# diff and a properly formatted GNU ChangeLog entry.
36 34
 #
37 35
 # Configuration subroutine to validate and canonicalize a configuration type.
38 36
 # Supply the specified configuration type as an argument.
39 37
 # If it is invalid, we print an error message on stderr and exit with code 1.
40 38
 # Otherwise, we print the canonical config type on stdout and succeed.
41 39
 
40
+# You can get the latest version of this script from:
41
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
42
+
42 43
 # This file is supposed to be the same for all GNU packages
43 44
 # and recognize all the CPU types, system types and aliases
44 45
 # that are meaningful with *any* GNU software.
@@ -72,8 +73,9 @@ Report bugs and patches to <config-patches@gnu.org>."
72 73
 version="\
73 74
 GNU config.sub ($timestamp)
74 75
 
75
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
76
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
76
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
77
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
78
+Free Software Foundation, Inc.
77 79
 
78 80
 This is free software; see the source for copying conditions.  There is NO
79 81
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -120,12 +122,18 @@ esac
120 122
 # Here we must recognize all the valid KERNEL-OS combinations.
121 123
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
122 124
 case $maybe_os in
123
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
124
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
125
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
126
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
127
+  knetbsd*-gnu* | netbsd*-gnu* | \
128
+  kopensolaris*-gnu* | \
125 129
   storm-chaos* | os2-emx* | rtmk-nova*)
126 130
     os=-$maybe_os
127 131
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
128 132
     ;;
133
+  android-linux)
134
+    os=-linux-android
135
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
136
+    ;;
129 137
   *)
130 138
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
131 139
     if [ $basic_machine != $1 ]
@@ -148,10 +156,13 @@ case $os in
148 156
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
149 157
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
150 158
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
151
-	-apple | -axis | -knuth | -cray)
159
+	-apple | -axis | -knuth | -cray | -microblaze)
152 160
 		os=
153 161
 		basic_machine=$1
154 162
 		;;
163
+	-bluegene*)
164
+		os=-cnk
165
+		;;
155 166
 	-sim | -cisco | -oki | -wec | -winbond)
156 167
 		os=
157 168
 		basic_machine=$1
@@ -166,10 +177,10 @@ case $os in
166 177
 		os=-chorusos
167 178
 		basic_machine=$1
168 179
 		;;
169
- 	-chorusrdb)
170
- 		os=-chorusrdb
180
+	-chorusrdb)
181
+		os=-chorusrdb
171 182
 		basic_machine=$1
172
- 		;;
183
+		;;
173 184
 	-hiux*)
174 185
 		os=-hiuxwe2
175 186
 		;;
@@ -238,24 +249,32 @@ case $basic_machine in
238 249
 	# Some are omitted here because they have special meanings below.
239 250
 	1750a | 580 \
240 251
 	| a29k \
252
+	| aarch64 | aarch64_be \
241 253
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
242 254
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
243 255
 	| am33_2.0 \
244 256
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
257
+        | be32 | be64 \
245 258
 	| bfin \
246 259
 	| c4x | clipper \
247 260
 	| d10v | d30v | dlx | dsp16xx \
261
+	| epiphany \
248 262
 	| fido | fr30 | frv \
249 263
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
264
+	| hexagon \
250 265
 	| i370 | i860 | i960 | ia64 \
251 266
 	| ip2k | iq2000 \
267
+	| le32 | le64 \
268
+	| lm32 \
252 269
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
253
-	| maxq | mb | microblaze | mcore | mep \
270
+	| maxq | mb | microblaze | mcore | mep | metag \
254 271
 	| mips | mipsbe | mipseb | mipsel | mipsle \
255 272
 	| mips16 \
256 273
 	| mips64 | mips64el \
257
-	| mips64vr | mips64vrel \
274
+	| mips64octeon | mips64octeonel \
258 275
 	| mips64orion | mips64orionel \
276
+	| mips64r5900 | mips64r5900el \
277
+	| mips64vr | mips64vrel \
259 278
 	| mips64vr4100 | mips64vr4100el \
260 279
 	| mips64vr4300 | mips64vr4300el \
261 280
 	| mips64vr5000 | mips64vr5000el \
@@ -268,29 +287,42 @@ case $basic_machine in
268 287
 	| mipsisa64sr71k | mipsisa64sr71kel \
269 288
 	| mipstx39 | mipstx39el \
270 289
 	| mn10200 | mn10300 \
290
+	| moxie \
271 291
 	| mt \
272 292
 	| msp430 \
293
+	| nds32 | nds32le | nds32be \
273 294
 	| nios | nios2 \
274 295
 	| ns16k | ns32k \
296
+	| open8 \
275 297
 	| or32 \
276 298
 	| pdp10 | pdp11 | pj | pjl \
277
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
299
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
278 300
 	| pyramid \
301
+	| rl78 | rx \
279 302
 	| score \
280
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
303
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
281 304
 	| sh64 | sh64le \
282 305
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
283 306
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
284
-	| spu | strongarm \
285
-	| tahoe | thumb | tic4x | tic80 | tron \
286
-	| v850 | v850e \
307
+	| spu \
308
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
309
+	| ubicom32 \
310
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
287 311
 	| we32k \
288
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
289
-	| z8k)
312
+	| x86 | xc16x | xstormy16 | xtensa \
313
+	| z8k | z80)
290 314
 		basic_machine=$basic_machine-unknown
291 315
 		;;
292
-	m6811 | m68hc11 | m6812 | m68hc12)
293
-		# Motorola 68HC11/12.
316
+	c54x)
317
+		basic_machine=tic54x-unknown
318
+		;;
319
+	c55x)
320
+		basic_machine=tic55x-unknown
321
+		;;
322
+	c6x)
323
+		basic_machine=tic6x-unknown
324
+		;;
325
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
294 326
 		basic_machine=$basic_machine-unknown
295 327
 		os=-none
296 328
 		;;
@@ -300,6 +332,21 @@ case $basic_machine in
300 332
 		basic_machine=mt-unknown
301 333
 		;;
302 334
 
335
+	strongarm | thumb | xscale)
336
+		basic_machine=arm-unknown
337
+		;;
338
+	xgate)
339
+		basic_machine=$basic_machine-unknown
340
+		os=-none
341
+		;;
342
+	xscaleeb)
343
+		basic_machine=armeb-unknown
344
+		;;
345
+
346
+	xscaleel)
347
+		basic_machine=armel-unknown
348
+		;;
349
+
303 350
 	# We use `pc' rather than `unknown'
304 351
 	# because (1) that's what they normally are, and
305 352
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -314,29 +361,36 @@ case $basic_machine in
314 361
 	# Recognize the basic CPU types with company name.
315 362
 	580-* \
316 363
 	| a29k-* \
364
+	| aarch64-* | aarch64_be-* \
317 365
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
318 366
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
319 367
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
320 368
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
321 369
 	| avr-* | avr32-* \
370
+	| be32-* | be64-* \
322 371
 	| bfin-* | bs2000-* \
323
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
372
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
324 373
 	| clipper-* | craynv-* | cydra-* \
325 374
 	| d10v-* | d30v-* | dlx-* \
326 375
 	| elxsi-* \
327 376
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
328 377
 	| h8300-* | h8500-* \
329 378
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
379
+	| hexagon-* \
330 380
 	| i*86-* | i860-* | i960-* | ia64-* \
331 381
 	| ip2k-* | iq2000-* \
382
+	| le32-* | le64-* \
383
+	| lm32-* \
332 384
 	| m32c-* | m32r-* | m32rle-* \
333 385
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
334
-	| m88110-* | m88k-* | maxq-* | mcore-* \
386
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
335 387
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
336 388
 	| mips16-* \
337 389
 	| mips64-* | mips64el-* \
338
-	| mips64vr-* | mips64vrel-* \
390
+	| mips64octeon-* | mips64octeonel-* \
339 391
 	| mips64orion-* | mips64orionel-* \
392
+	| mips64r5900-* | mips64r5900el-* \
393
+	| mips64vr-* | mips64vrel-* \
340 394
 	| mips64vr4100-* | mips64vr4100el-* \
341 395
 	| mips64vr4300-* | mips64vr4300el-* \
342 396
 	| mips64vr5000-* | mips64vr5000el-* \
@@ -351,27 +405,32 @@ case $basic_machine in
351 405
 	| mmix-* \
352 406
 	| mt-* \
353 407
 	| msp430-* \
408
+	| nds32-* | nds32le-* | nds32be-* \
354 409
 	| nios-* | nios2-* \
355 410
 	| none-* | np1-* | ns16k-* | ns32k-* \
411
+	| open8-* \
356 412
 	| orion-* \
357 413
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
358
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
414
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
359 415
 	| pyramid-* \
360
-	| romp-* | rs6000-* \
361
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
416
+	| rl78-* | romp-* | rs6000-* | rx-* \
417
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
362 418
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
363 419
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
364 420
 	| sparclite-* \
365
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
366
-	| tahoe-* | thumb-* \
421
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
422
+	| tahoe-* \
367 423
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
424
+	| tile*-* \
368 425
 	| tron-* \
369
-	| v850-* | v850e-* | vax-* \
426
+	| ubicom32-* \
427
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
428
+	| vax-* \
370 429
 	| we32k-* \
371
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
430
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
372 431
 	| xstormy16-* | xtensa*-* \
373 432
 	| ymp-* \
374
-	| z8k-*)
433
+	| z8k-* | z80-*)
375 434
 		;;
376 435
 	# Recognize the basic CPU types without company name, with glob match.
377 436
 	xtensa*)
@@ -393,7 +452,7 @@ case $basic_machine in
393 452
 		basic_machine=a29k-amd
394 453
 		os=-udi
395 454
 		;;
396
-    	abacus)
455
+	abacus)
397 456
 		basic_machine=abacus-unknown
398 457
 		;;
399 458
 	adobe68k)
@@ -439,6 +498,10 @@ case $basic_machine in
439 498
 		basic_machine=m68k-apollo
440 499
 		os=-bsd
441 500
 		;;
501
+	aros)
502
+		basic_machine=i386-pc
503
+		os=-aros
504
+		;;
442 505
 	aux)
443 506
 		basic_machine=m68k-apple
444 507
 		os=-aux
@@ -455,10 +518,27 @@ case $basic_machine in
455 518
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
456 519
 		os=-linux
457 520
 		;;
521
+	bluegene*)
522
+		basic_machine=powerpc-ibm
523
+		os=-cnk
524
+		;;
525
+	c54x-*)
526
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
527
+		;;
528
+	c55x-*)
529
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
530
+		;;
531
+	c6x-*)
532
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
533
+		;;
458 534
 	c90)
459 535
 		basic_machine=c90-cray
460 536
 		os=-unicos
461 537
 		;;
538
+	cegcc)
539
+		basic_machine=arm-unknown
540
+		os=-cegcc
541
+		;;
462 542
 	convex-c1)
463 543
 		basic_machine=c1-convex
464 544
 		os=-bsd
@@ -487,7 +567,7 @@ case $basic_machine in
487 567
 		basic_machine=craynv-cray
488 568
 		os=-unicosmp
489 569
 		;;
490
-	cr16)
570
+	cr16 | cr16-*)
491 571
 		basic_machine=cr16-unknown
492 572
 		os=-elf
493 573
 		;;
@@ -526,6 +606,10 @@ case $basic_machine in
526 606
 		basic_machine=m88k-motorola
527 607
 		os=-sysv3
528 608
 		;;
609
+	dicos)
610
+		basic_machine=i686-pc
611
+		os=-dicos
612
+		;;
529 613
 	djgpp)
530 614
 		basic_machine=i586-pc
531 615
 		os=-msdosdjgpp
@@ -641,7 +725,6 @@ case $basic_machine in
641 725
 	i370-ibm* | ibm*)
642 726
 		basic_machine=i370-ibm
643 727
 		;;
644
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
645 728
 	i*86v32)
646 729
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
647 730
 		os=-sysv32
@@ -699,6 +782,9 @@ case $basic_machine in
699 782
 		basic_machine=ns32k-utek
700 783
 		os=-sysv
701 784
 		;;
785
+	microblaze)
786
+		basic_machine=microblaze-xilinx
787
+		;;
702 788
 	mingw32)
703 789
 		basic_machine=i386-pc
704 790
 		os=-mingw32
@@ -735,10 +821,18 @@ case $basic_machine in
735 821
 	ms1-*)
736 822
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
737 823
 		;;
824
+	msys)
825
+		basic_machine=i386-pc
826
+		os=-msys
827
+		;;
738 828
 	mvs)
739 829
 		basic_machine=i370-ibm
740 830
 		os=-mvs
741 831
 		;;
832
+	nacl)
833
+		basic_machine=le32-unknown
834
+		os=-nacl
835
+		;;
742 836
 	ncr3000)
743 837
 		basic_machine=i486-ncr
744 838
 		os=-sysv4
@@ -803,6 +897,12 @@ case $basic_machine in
803 897
 	np1)
804 898
 		basic_machine=np1-gould
805 899
 		;;
900
+	neo-tandem)
901
+		basic_machine=neo-tandem
902
+		;;
903
+	nse-tandem)
904
+		basic_machine=nse-tandem
905
+		;;
806 906
 	nsr-tandem)
807 907
 		basic_machine=nsr-tandem
808 908
 		;;
@@ -885,9 +985,10 @@ case $basic_machine in
885 985
 		;;
886 986
 	power)	basic_machine=power-ibm
887 987
 		;;
888
-	ppc)	basic_machine=powerpc-unknown
988
+	ppc | ppcbe)	basic_machine=powerpc-unknown
889 989
 		;;
890
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
990
+	ppc-* | ppcbe-*)
991
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
891 992
 		;;
892 993
 	ppcle | powerpclittle | ppc-le | powerpc-little)
893 994
 		basic_machine=powerpcle-unknown
@@ -981,6 +1082,9 @@ case $basic_machine in
981 1082
 		basic_machine=i860-stratus
982 1083
 		os=-sysv4
983 1084
 		;;
1085
+	strongarm-* | thumb-*)
1086
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
1087
+		;;
984 1088
 	sun2)
985 1089
 		basic_machine=m68000-sun
986 1090
 		;;
@@ -1037,20 +1141,8 @@ case $basic_machine in
1037 1141
 		basic_machine=t90-cray
1038 1142
 		os=-unicos
1039 1143
 		;;
1040
-	tic54x | c54x*)
1041
-		basic_machine=tic54x-unknown
1042
-		os=-coff
1043
-		;;
1044
-	tic55x | c55x*)
1045
-		basic_machine=tic55x-unknown
1046
-		os=-coff
1047
-		;;
1048
-	tic6x | c6x*)
1049
-		basic_machine=tic6x-unknown
1050
-		os=-coff
1051
-		;;
1052 1144
 	tile*)
1053
-		basic_machine=tile-unknown
1145
+		basic_machine=$basic_machine-unknown
1054 1146
 		os=-linux-gnu
1055 1147
 		;;
1056 1148
 	tx39)
@@ -1120,6 +1212,9 @@ case $basic_machine in
1120 1212
 	xps | xps100)
1121 1213
 		basic_machine=xps100-honeywell
1122 1214
 		;;
1215
+	xscale-* | xscalee[bl]-*)
1216
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
1217
+		;;
1123 1218
 	ymp)
1124 1219
 		basic_machine=ymp-cray
1125 1220
 		os=-unicos
@@ -1128,6 +1223,10 @@ case $basic_machine in
1128 1223
 		basic_machine=z8k-unknown
1129 1224
 		os=-sim
1130 1225
 		;;
1226
+	z80-*-coff)
1227
+		basic_machine=z80-unknown
1228
+		os=-sim
1229
+		;;
1131 1230
 	none)
1132 1231
 		basic_machine=none-none
1133 1232
 		os=-none
@@ -1166,7 +1265,7 @@ case $basic_machine in
1166 1265
 	we32k)
1167 1266
 		basic_machine=we32k-att
1168 1267
 		;;
1169
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
1268
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
1170 1269
 		basic_machine=sh-unknown
1171 1270
 		;;
1172 1271
 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1213,9 +1312,12 @@ esac
1213 1312
 if [ x"$os" != x"" ]
1214 1313
 then
1215 1314
 case $os in
1216
-        # First match some system type aliases
1217
-        # that might get confused with valid system types.
1315
+	# First match some system type aliases
1316
+	# that might get confused with valid system types.
1218 1317
 	# -solaris* is a basic system type, with this one exception.
1318
+	-auroraux)
1319
+		os=-auroraux
1320
+		;;
1219 1321
 	-solaris1 | -solaris1.*)
1220 1322
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
1221 1323
 		;;
@@ -1236,10 +1338,11 @@ case $os in
1236 1338
 	# Each alternative MUST END IN A *, to match a version number.
1237 1339
 	# -sysv* is not here because it comes later, after sysvr4.
1238 1340
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1239
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
1240
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
1341
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1342
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
1343
+	      | -sym* | -kopensolaris* \
1241 1344
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1242
-	      | -aos* \
1345
+	      | -aos* | -aros* \
1243 1346
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1244 1347
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1245 1348
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1248,9 +1351,10 @@ case $os in
1248 1351
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1249 1352
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1250 1353
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1251
-	      | -chorusos* | -chorusrdb* \
1252
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1253
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
1354
+	      | -chorusos* | -chorusrdb* | -cegcc* \
1355
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1356
+	      | -mingw32* | -linux-gnu* | -linux-android* \
1357
+	      | -linux-newlib* | -linux-uclibc* \
1254 1358
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
1255 1359
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1256 1360
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1258,7 +1362,7 @@ case $os in
1258 1362
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1259 1363
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1260 1364
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1261
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
1365
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
1262 1366
 	# Remember, each alternative MUST END IN *, to match a version number.
1263 1367
 		;;
1264 1368
 	-qnx*)
@@ -1297,7 +1401,7 @@ case $os in
1297 1401
 	-opened*)
1298 1402
 		os=-openedition
1299 1403
 		;;
1300
-        -os400*)
1404
+	-os400*)
1301 1405
 		os=-os400
1302 1406
 		;;
1303 1407
 	-wince*)
@@ -1346,7 +1450,7 @@ case $os in
1346 1450
 	-sinix*)
1347 1451
 		os=-sysv4
1348 1452
 		;;
1349
-        -tpf*)
1453
+	-tpf*)
1350 1454
 		os=-tpf
1351 1455
 		;;
1352 1456
 	-triton*)
@@ -1388,6 +1492,11 @@ case $os in
1388 1492
 	-zvmoe)
1389 1493
 		os=-zvmoe
1390 1494
 		;;
1495
+	-dicos*)
1496
+		os=-dicos
1497
+		;;
1498
+	-nacl*)
1499
+		;;
1391 1500
 	-none)
1392 1501
 		;;
1393 1502
 	*)
@@ -1410,10 +1519,10 @@ else
1410 1519
 # system, and we'll never get to this point.
1411 1520
 
1412 1521
 case $basic_machine in
1413
-        score-*)
1522
+	score-*)
1414 1523
 		os=-elf
1415 1524
 		;;
1416
-        spu-*)
1525
+	spu-*)
1417 1526
 		os=-elf
1418 1527
 		;;
1419 1528
 	*-acorn)
@@ -1425,8 +1534,17 @@ case $basic_machine in
1425 1534
 	arm*-semi)
1426 1535
 		os=-aout
1427 1536
 		;;
1428
-        c4x-* | tic4x-*)
1429
-        	os=-coff
1537
+	c4x-* | tic4x-*)
1538
+		os=-coff
1539
+		;;
1540
+	tic54x-*)
1541
+		os=-coff
1542
+		;;
1543
+	tic55x-*)
1544
+		os=-coff
1545
+		;;
1546
+	tic6x-*)
1547
+		os=-coff
1430 1548
 		;;
1431 1549
 	# This must come before the *-dec entry.
1432 1550
 	pdp10-*)
@@ -1446,14 +1564,11 @@ case $basic_machine in
1446 1564
 		;;
1447 1565
 	m68000-sun)
1448 1566
 		os=-sunos3
1449
-		# This also exists in the configure program, but was not the
1450
-		# default.
1451
-		# os=-sunos4
1452 1567
 		;;
1453 1568
 	m68*-cisco)
1454 1569
 		os=-aout
1455 1570
 		;;
1456
-        mep-*)
1571
+	mep-*)
1457 1572
 		os=-elf
1458 1573
 		;;
1459 1574
 	mips*-cisco)
@@ -1480,7 +1595,7 @@ case $basic_machine in
1480 1595
 	*-ibm)
1481 1596
 		os=-aix
1482 1597
 		;;
1483
-    	*-knuth)
1598
+	*-knuth)
1484 1599
 		os=-mmixware
1485 1600
 		;;
1486 1601
 	*-wec)
@@ -1585,7 +1700,7 @@ case $basic_machine in
1585 1700
 			-sunos*)
1586 1701
 				vendor=sun
1587 1702
 				;;
1588
-			-aix*)
1703
+			-cnk*|-aix*)
1589 1704
 				vendor=ibm
1590 1705
 				;;
1591 1706
 			-beos*)

+ 5298
- 6251
configure
File diff suppressed because it is too large
View File


+ 3
- 3
configure.ac View File

@@ -15,13 +15,13 @@ m4_define([library_name], [liblqr-api_version])
15 15
 dnl These three define the library version number
16 16
 m4_define([package_major_version], [0])
17 17
 m4_define([package_minor_version], [4])
18
-m4_define([package_micro_version], [1])
18
+m4_define([package_micro_version], [2])
19 19
 
20 20
 m4_define([package_version],
21 21
           [package_major_version.package_minor_version.package_micro_version])
22 22
 
23 23
 m4_define([ltversion_current], [3])
24
-m4_define([ltversion_revision], [1])
24
+m4_define([ltversion_revision], [2])
25 25
 m4_define([ltversion_age], [3])
26 26
 
27 27
 AC_INIT([library_name], [package_version])
@@ -132,7 +132,7 @@ AS_IF([test "x$legacy_macros" = "xfalse"],
132 132
       [:]
133 133
       )
134 134
 
135
-AC_ARG_ENABLE([dllimport],
135
+AC_ARG_ENABLE([declspec],
136 136
      [AS_HELP_STRING([--disable-declspec], [Disable Win32 __declspec directives (only meaningful for building static library on MinGW)])],
137 137
      [AS_CASE([["${enableval}"]],
138 138
 	  [yes], [declspec=true],

+ 7
- 7
docs/liblqr_manual.docbook View File

@@ -48,7 +48,7 @@
48 48
             <surname>Baldassi</surname>
49 49
         </author>
50 50
         <productname class='copyright'>LqR library</productname>
51
-        <productnumber>0.4.1 API (3:1:3)</productnumber>
51
+        <productnumber>0.4.2 API (3:2:3)</productnumber>
52 52
         <copyright>
53 53
             <year>2007</year>
54 54
             <year>2008</year>
@@ -1300,7 +1300,7 @@ lqr_carver_set_energy_function (carver, sobel, 1, LQR_ER_BRIGHTNESS, NULL);
1300 1300
                     </funcsynopsis>
1301 1301
                 </para>
1302 1302
                 <para>
1303
-                    The last function can be used to fill directly an image buffer:
1303
+                    The third function can be used to fill directly an image buffer:
1304 1304
                     <funcsynopsis>
1305 1305
                         <funcprototype>
1306 1306
                             <funcdef>LqrRetVal <function>lqr_carver_get_energy_image</function></funcdef>
@@ -1328,7 +1328,7 @@ lqr_carver_set_energy_function (carver, sobel, 1, LQR_ER_BRIGHTNESS, NULL);
1328 1328
                     <para>
1329 1329
                         Calling the function <function>lqr_carver_get_energy_image</function> with &col_depth_32f; and
1330 1330
                         &img_type_grey; arguments will yield the same result as calling the function
1331
-                        <function>lqr_carver_get_image</function>, but the latter is slightly more efficient.
1331
+                        <function>lqr_carver_get_energy</function>, but the latter is slightly more efficient.
1332 1332
                     </para>
1333 1333
                 </note>
1334 1334
             </sect2>
@@ -1491,7 +1491,7 @@ lqr_carver_set_energy_function (carver, sobel, 1, LQR_ER_BRIGHTNESS, NULL);
1491 1491
                 <para>
1492 1492
                     The provided buffers have to be of size <literal>&param_w; * &param_h;</literal> (or
1493 1493
                     <literal>&param_w; * &param_h; * &param_channels;</literal> for the rgb case) but the specified
1494
-                    areas need not to be strictly included inside the &carv_obj; image area : only the parts which
1494
+                    areas need not to be strictly included inside the &carv_obj; image area: only the parts which
1495 1495
                     overlap with it will be used. For example, the offsets can also be negative.
1496 1496
                 </para>
1497 1497
             </sect2>
@@ -1658,7 +1658,7 @@ lqr_carver_set_energy_function (carver, sobel, 1, LQR_ER_BRIGHTNESS, NULL);
1658 1658
                 <para>
1659 1659
                     The provided buffers have to be of size <literal>&param_w; * &param_h;</literal> (or
1660 1660
                     <literal>&param_w; * &param_h; * &param_channels;</literal> for the rgb case) but the specified
1661
-                    areas need not to be strictly included inside the &carv_obj; image area : only the parts which
1661
+                    areas need not to be strictly included inside the &carv_obj; image area: only the parts which
1662 1662
                     overlap with it will be used. For example, the offsets can also be negative.
1663 1663
                 </para>
1664 1664
             </sect2>
@@ -2015,7 +2015,7 @@ vis =  buffer[y * width + x];
2015 2015
                         </programlisting>
2016 2016
                         <para>
2017 2017
                             Uninitialised points will yield <literal><symbol>vis</symbol> = 0</literal>. For
2018
-                            initialised points, <symbol>vis</symbol> will store a positive value between
2018
+			    initialised points, <literal><symbol>vis</symbol></literal> will store a positive value between
2019 2019
                             <literal>1</literal> (least visible points, the first to be carved away or to be duplicated)
2020 2020
                             and <literal>(&param_depth; + 1)</literal> (most visible points, the last to be carved away
2021 2021
                             or to be duplicated).
@@ -2229,7 +2229,7 @@ lqr_carver_list_foreach_recursive (list, my_func, data_tok);
2229 2229
             <title>Progress indicators</title>
2230 2230
 
2231 2231
             <para>
2232
-                By default, the resizing performed silently. However, it is possible to define progress report
2232
+                By default, the resizing is performed silently. However, it is possible to define progress report
2233 2233
                 functions, to receive feedback while the resizing is in progress. This is done through the &prog_obj;
2234 2234
                 objects. 
2235 2235
             </para>

+ 1
- 1
examples/liquidrescale.cpp View File

@@ -221,7 +221,7 @@ main(int argc, char **argv)
221 221
     TRAP_N(carver = lqr_carver_new(rgb_buffer, old_width, old_height, 3));
222 222
 
223 223
     /* (I.2) if we have to attach other images, we have to do so
224
-     *       immediatley after the carver construction (we might
224
+     *       immediately after the carver construction (we might
225 225
      *       initialize the carver first, but not load a visibility map)*/
226 226
     LqrCarver *pres_carver;
227 227
     if (pres_outfile) {

+ 3
- 2
install-sh View File

@@ -1,7 +1,7 @@
1 1
 #!/bin/sh
2 2
 # install - install a program, script, or datafile
3 3
 
4
-scriptversion=2006-12-25.00
4
+scriptversion=2009-04-28.21; # UTC
5 5
 
6 6
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
7 7
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -515,5 +515,6 @@ done
515 515
 # eval: (add-hook 'write-file-hooks 'time-stamp)
516 516
 # time-stamp-start: "scriptversion="
517 517
 # time-stamp-format: "%:y-%02m-%02d.%02H"
518
-# time-stamp-end: "$"
518
+# time-stamp-time-zone: "UTC"
519
+# time-stamp-end: "; # UTC"
519 520
 # End:

+ 5
- 1
lqr/Makefile.in View File

@@ -144,6 +144,7 @@ MAINT = @MAINT@
144 144
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
145 145
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
146 146
 MAKEINFO = @MAKEINFO@
147
+MANIFEST_TOOL = @MANIFEST_TOOL@
147 148
 NM = @NM@
148 149
 NMEDIT = @NMEDIT@
149 150
 OBJDUMP = @OBJDUMP@
@@ -155,15 +156,19 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
155 156
 PACKAGE_NAME = @PACKAGE_NAME@
156 157
 PACKAGE_STRING = @PACKAGE_STRING@
157 158
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
159
+PACKAGE_URL = @PACKAGE_URL@
158 160
 PACKAGE_VERSION = @PACKAGE_VERSION@
159 161
 PATH_SEPARATOR = @PATH_SEPARATOR@
160 162
 PKG_CONFIG = @PKG_CONFIG@
163
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
164
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
161 165
 RANLIB = @RANLIB@
162 166
 SED = @SED@
163 167
 SET_MAKE = @SET_MAKE@
164 168
 SHELL = @SHELL@
165 169
 STRIP = @STRIP@
166 170
 VERSION = @VERSION@
171
+ac_ct_AR = @ac_ct_AR@
167 172
 ac_ct_CC = @ac_ct_CC@
168 173
 ac_ct_CXX = @ac_ct_CXX@
169 174
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -200,7 +205,6 @@ libdir = @libdir@
200 205
 libexecdir = @libexecdir@
201 206
 localedir = @localedir@
202 207
 localstatedir = @localstatedir@
203
-lt_ECHO = @lt_ECHO@
204 208
 mandir = @mandir@
205 209
 mkdir_p = @mkdir_p@
206 210
 oldincludedir = @oldincludedir@

+ 7
- 2
lqr/lqr_carver.c View File

@@ -171,6 +171,7 @@ lqr_carver_destroy(LqrCarver *r)
171 171
     if (r->root == NULL) {
172 172
         g_free(r->vs);
173 173
     }
174
+    g_free(r->rgb_ro_buffer);
174 175
     g_free(r->en);
175 176
     g_free(r->bias);
176 177
     g_free(r->m);
@@ -1394,8 +1395,8 @@ lqr_carver_propagate_vsmap(LqrCarver *r)
1394 1395
 LqrRetVal
1395 1396
 lqr_carver_propagate_vsmap_attached(LqrCarver *r, LqrDataTok data)
1396 1397
 {
1397
-    LqrDataTok data_tok;
1398
-    data_tok.data = NULL;
1398
+    /* LqrDataTok data_tok;
1399
+    data_tok.data = NULL; */
1399 1400
     r->vs = r->root->vs;
1400 1401
     lqr_carver_scan_reset(r);
1401 1402
     /* LQR_CATCH (lqr_carver_list_foreach (r->attached_list,  lqr_carver_propagate_vsmap_attached, data_tok)); */
@@ -1943,7 +1944,11 @@ lqr_carver_set_state(LqrCarver *r, LqrCarverState state, gboolean skip_canceled)
1943 1944
 
1944 1945
     LQR_CATCH_F(r->root == NULL);
1945 1946
 
1947
+#if (GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION < 30)
1946 1948
     lock_pos = g_atomic_int_exchange_and_add(&r->state_lock_queue, 1);
1949
+#else
1950
+    lock_pos = g_atomic_int_add(&r->state_lock_queue, 1);
1951
+#endif /* GLIB_VERSION < 2.30 */
1947 1952
 
1948 1953
     while (g_atomic_int_get(&r->state_lock) != lock_pos) {
1949 1954
         g_usleep(10000);

+ 6
- 9
lqr/lqr_energy.c View File

@@ -44,7 +44,7 @@
44 44
 
45 45
 /* read normalised pixel value from
46 46
  * rgb buffer at the given index */
47
-inline gdouble
47
+gdouble
48 48
 lqr_pixel_get_norm(void *rgb, gint rgb_ind, LqrColDepth col_depth)
49 49
 {
50 50
     switch (col_depth) {
@@ -66,7 +66,7 @@ lqr_pixel_get_norm(void *rgb, gint rgb_ind, LqrColDepth col_depth)
66 66
 
67 67
 /* write pixel from normalised value
68 68
  * in rgb buffer at the given index */
69
-inline void
69
+void
70 70
 lqr_pixel_set_norm(gdouble val, void *rgb, gint rgb_ind, LqrColDepth col_depth)
71 71
 {
72 72
     switch (col_depth) {
@@ -90,7 +90,7 @@ lqr_pixel_set_norm(gdouble val, void *rgb, gint rgb_ind, LqrColDepth col_depth)
90 90
     }
91 91
 }
92 92
 
93
-inline gdouble
93
+gdouble
94 94
 lqr_pixel_get_rgbcol(void *rgb, gint rgb_ind, LqrColDepth col_depth, LqrImageType image_type, gint channel)
95 95
 {
96 96
     gdouble black_fact = 0;
@@ -115,7 +115,7 @@ lqr_pixel_get_rgbcol(void *rgb, gint rgb_ind, LqrColDepth col_depth, LqrImageTyp
115 115
     }
116 116
 }
117 117
 
118
-inline gdouble
118
+gdouble
119 119
 lqr_carver_read_brightness_grey(LqrCarver *r, gint x, gint y)
120 120
 {
121 121
     gint now = r->raw[y][x];
@@ -123,7 +123,7 @@ lqr_carver_read_brightness_grey(LqrCarver *r, gint x, gint y)
123 123
     return lqr_pixel_get_norm(r->rgb, rgb_ind, r->col_depth);
124 124
 }
125 125
 
126
-inline gdouble
126
+gdouble
127 127
 lqr_carver_read_brightness_std(LqrCarver *r, gint x, gint y)
128 128
 {
129 129
     gdouble red, green, blue;
@@ -205,7 +205,7 @@ lqr_carver_read_brightness(LqrCarver *r, gint x, gint y)
205 205
     return bright * alpha_fact;
206 206
 }
207 207
 
208
-inline gdouble
208
+gdouble
209 209
 lqr_carver_read_luma_std(LqrCarver *r, gint x, gint y)
210 210
 {
211 211
     gdouble red, green, blue;
@@ -617,7 +617,6 @@ lqr_carver_get_true_energy(LqrCarver *r, gfloat *buffer, gint orientation)
617 617
     gint x, y;
618 618
     gint z0 = 0;
619 619
     gint w, h;
620
-    gint buf_size;
621 620
     gint data;
622 621
 
623 622
     LQR_CATCH_F(orientation == 0 || orientation == 1);
@@ -635,8 +634,6 @@ lqr_carver_get_true_energy(LqrCarver *r, gfloat *buffer, gint orientation)
635 634
         LQR_CATCH(lqr_carver_flatten(r));
636 635
     }
637 636
 
638
-    buf_size = r->w * r->h;
639
-
640 637
     if (orientation != lqr_carver_get_orientation(r)) {
641 638
         LQR_CATCH(lqr_carver_transpose(r));
642 639
     }

+ 11
- 11
lqr/lqr_energy_priv.h View File

@@ -38,18 +38,18 @@
38 38
 #define LQR_SATURATE_(x) (1 / (1 + (1 / (x))))
39 39
 #define LQR_SATURATE(x) ((x) >= 0 ? LQR_SATURATE_(x) : -LQR_SATURATE_(-x))
40 40
 
41
-inline gdouble lqr_pixel_get_norm(void *src, gint src_ind, LqrColDepth col_depth);
42
-inline void lqr_pixel_set_norm(gdouble val, void *rgb, gint rgb_ind, LqrColDepth col_depth);
43
-inline gdouble lqr_pixel_get_rgbcol(void *rgb, gint rgb_ind, LqrColDepth col_depth, LqrImageType image_type,
44
-                                    gint channel);
45
-inline gdouble lqr_carver_read_brightness_grey(LqrCarver *r, gint x, gint y);
46
-inline gdouble lqr_carver_read_brightness_std(LqrCarver *r, gint x, gint y);
41
+gdouble lqr_pixel_get_norm(void *src, gint src_ind, LqrColDepth col_depth);
42
+void lqr_pixel_set_norm(gdouble val, void *rgb, gint rgb_ind, LqrColDepth col_depth);
43
+gdouble lqr_pixel_get_rgbcol(void *rgb, gint rgb_ind, LqrColDepth col_depth, LqrImageType image_type,
44
+                             gint channel);
45
+gdouble lqr_carver_read_brightness_grey(LqrCarver *r, gint x, gint y);
46
+gdouble lqr_carver_read_brightness_std(LqrCarver *r, gint x, gint y);
47 47
 gdouble lqr_carver_read_brightness_custom(LqrCarver *r, gint x, gint y);
48
-inline gdouble lqr_carver_read_brightness(LqrCarver *r, gint x, gint y);
49
-inline gdouble lqr_carver_read_luma_std(LqrCarver *r, gint x, gint y);
50
-inline gdouble lqr_carver_read_luma(LqrCarver *r, gint x, gint y);
51
-inline gdouble lqr_carver_read_rgba(LqrCarver *r, gint x, gint y, gint channel);
52
-inline gdouble lqr_carver_read_custom(LqrCarver *r, gint x, gint y, gint channel);
48
+gdouble lqr_carver_read_brightness(LqrCarver *r, gint x, gint y);
49
+gdouble lqr_carver_read_luma_std(LqrCarver *r, gint x, gint y);
50
+gdouble lqr_carver_read_luma(LqrCarver *r, gint x, gint y);
51
+gdouble lqr_carver_read_rgba(LqrCarver *r, gint x, gint y, gint channel);
52
+gdouble lqr_carver_read_custom(LqrCarver *r, gint x, gint y, gint channel);
53 53
 
54 54
 gdouble lqr_carver_read_cached_std(LqrCarver *r, gint x, gint y);
55 55
 gdouble lqr_carver_read_cached_rgba(LqrCarver *r, gint x, gint y, gint channel);

+ 1
- 0
lqr/lqr_rwindow.c View File

@@ -294,6 +294,7 @@ lqr_rwindow_destroy(LqrReadingWindow *rwindow)
294 294
     buffer[0] -= rwindow->radius * rwindow->channels;
295 295
     g_free(buffer[0]);
296 296
     g_free(buffer);
297
+    g_free(rwindow);
297 298
 }
298 299
 
299 300
 gdouble

+ 2645
- 1396
ltmain.sh
File diff suppressed because it is too large
View File


+ 0
- 74
man/LqrColDepth.3 View File

@@ -1,74 +0,0 @@
1
-.\"     Title: \fBLqrColDepth\fR
2
-.\"    Author: Carlo Baldassi
3
-.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
4
-.\"      Date: 10 Maj 2009
5
-.\"    Manual: LqR library API reference
6
-.\"    Source: LqR library 0.4.1 API (3:1:3)
7
-.\"
8
-.TH "\FBLQRCOLDEPTH\FR" "3" "10 Maj 2009" "LqR library 0.4.1 API (3:1:3)" "LqR library API reference"
9
-.\" disable hyphenation
10
-.nh
11
-.\" disable justification (adjust text to left margin only)
12
-.ad l
13
-.SH "NAME"
14
-LqrColDepth \- carver objects colour depth specification
15
-.SH "DESCRIPTION"
16
-.PP
17
-The default
18
-LqrCarver
19
-object constructor
20
-\fBlqr_carver_new\fR
21
-uses a colour depth of 8 bits per channel, and therefore its input must be an array of
22
-\fBunsigned char\fRs\&. However, the
23
-LqrCarver
24
-objects can handle images of grater colour depth, if they are created with the
25
-\fBlqr_carver_new_ext\fR
26
-constructor\&. The possible colour depths are specified through variables of type
27
-\fBLqrColDepth\fR, which is an enum type; its possible values, and the type of the input buffer associated with them, are:
28
-.PP
29
-LQR_COLDEPTH_8I
30
-.RS 4
31
-use type
32
-\fBguchar\fR
33
-(8 bit unsigned integers) \- the default
34
-.RE
35
-.PP
36
-LQR_COLDEPTH_16I
37
-.RS 4
38
-use type
39
-\fBguint16\fR
40
-(16 bit unsigned integers)
41
-.RE
42
-.PP
43
-LQR_COLDEPTH_32F
44
-.RS 4
45
-use type
46
-\fBgfloat\fR
47
-(32 bit floating point)
48
-.RE
49
-.PP
50
-LQR_COLDEPTH_64F
51
-.RS 4
52
-use type
53
-\fBgdouble\fR
54
-(64 bit floating point)
55
-.RE
56
-.PP
57
-These values are also relevant when reading out a
58
-LqrCarver
59
-object with the functions
60
-\fBlqr_carver_scan_ext\fR
61
-or
62
-\fBlqr_carver_scan_line_ext\fR, since the readout buffer must be cast to the appropriate type to be actually read\&.
63
-.PP
64
-The colour depth of an
65
-LqrCarver
66
-object can be obtained with the function
67
-\fBlqr_carver_get_col_depth\fR\&.
68
-.SH "SEE ALSO"
69
-.PP
70
-
71
-\fBlqr_carver_new\fR(3), \fBlqr_carver_get_col_depth\fR(3), \fBlqr_carver_scan\fR(3), \fBlqr_carver_scan_line\fR(3)
72
-.SH "COPYRIGHT"
73
-Copyright \(co 2007-2009 Carlo Baldassi
74
-.br

+ 0
- 61
man/LqrImageType.3 View File

@@ -1,61 +0,0 @@
1
-.\"     Title: \fBLqrImageType\fR
2
-.\"    Author: Carlo Baldassi
3
-.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
4
-.\"      Date: 10 Maj 2009
5
-.\"    Manual: LqR library API reference
6
-.\"    Source: LqR library 0.4.1 API (3:1:3)
7
-.\"
8
-.TH "\FBLQRIMAGETYPE\FR" "3" "10 Maj 2009" "LqR library 0.4.1 API (3:1:3)" "LqR library API reference"
9
-.\" disable hyphenation
10
-.nh
11
-.\" disable justification (adjust text to left margin only)
12
-.ad l
13
-.SH "NAME"
14
-LqrImageType \- carver objects image type (colour model) specification
15
-.SH "DESCRIPTION"
16
-.PP
17
-The
18
-LqrCarver
19
-objects use knowledge about the image type they\'re working on in order to compute correctly some quantities (e\&.g\&. the brightness) for the automatic feature detection\&. Image types are set automatically by the constructors, but they can also be specified manually using quantities of the type
20
-\fBLqrImageType\fR, which is an
21
-enum
22
-which can take these values:
23
-.sp
24
-.RS 4
25
-\h'-04'\(bu\h'+03'LQR_GREY_IMAGE.RE
26
-.sp
27
-.RS 4
28
-\h'-04'\(bu\h'+03'LQR_GREYA_IMAGE.RE
29
-.sp
30
-.RS 4
31
-\h'-04'\(bu\h'+03'LQR_RGB_IMAGE.RE
32
-.sp
33
-.RS 4
34
-\h'-04'\(bu\h'+03'LQR_RGBA_IMAGE.RE
35
-.sp
36
-.RS 4
37
-\h'-04'\(bu\h'+03'LQR_CMY_IMAGE.RE
38
-.sp
39
-.RS 4
40
-\h'-04'\(bu\h'+03'LQR_CMYK_IMAGE.RE
41
-.sp
42
-.RS 4
43
-\h'-04'\(bu\h'+03'LQR_CMYKA_IMAGE.RE
44
-.sp
45
-.RS 4
46
-\h'-04'\(bu\h'+03'LQR_CUSTOM_IMAGE.RE
47
-.sp
48
-.RE
49
-.PP
50
-Use the function
51
-\fBlqr_carver_set_image_type\fR(3)
52
-to set the image type of a carver, and the function
53
-\fBlqr_carver_get_image_type\fR(3)
54
-to read it out\&.
55
-.SH "SEE ALSO"
56
-.PP
57
-
58
-\fBlqr_carver_new\fR(3), \fBlqr_carver_set_image_type\fR(3), \fBlqr_carver_get_image_type\fR(3)
59
-.SH "COPYRIGHT"
60
-Copyright \(co 2007-2009 Carlo Baldassi
61
-.br

+ 0
- 51
man/LqrRetVal.3 View File

@@ -1,51 +0,0 @@
1
-.\"     Title: \fBLqrRetVal\fR
2
-.\"    Author: Carlo Baldassi
3
-.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
4
-.\"      Date: 10 Maj 2009
5
-.\"    Manual: LqR library API reference
6
-.\"    Source: LqR library 0.4.1 API (3:1:3)
7
-.\"
8
-.TH "\FBLQRRETVAL\FR" "3" "10 Maj 2009" "LqR library 0.4.1 API (3:1:3)" "LqR library API reference"
9
-.\" disable hyphenation
10
-.nh
11
-.\" disable justification (adjust text to left margin only)
12
-.ad l
13
-.SH "NAME"
14
-LqrRetVal \- the return value of many Liquid Rescale library functions
15
-.SH "DESCRIPTION"
16
-.PP
17
-The return type of many functions in the Liquid Rescale library is
18
-\fBLqrRetVal\fR, which is an
19
-enum
20
-type that can take these values:
21
-.PP
22
-\fBLQR_OK\fR
23
-.RS 4
24
-everyting OK
25
-.RE
26
-.PP
27
-\fBLQR_ERROR\fR
28
-.RS 4
29
-generic
30
-fatal
31
-error
32
-.RE
33
-.PP
34
-\fBLQR_NOMEM\fR
35
-.RS 4
36
-not enough memory
37
-.RE
38
-.PP
39
-\fBLQR_USRCANCEL\fR
40
-.RS 4
41
-action cancelled by the user
42
-.RE
43
-.PP
44
-The user should handle the error values explicitly at each function call returning this type\&.
45
-.SH "SEE ALSO"
46
-.PP
47
-
48
-\fBlqr_carver_init\fR(3), \fBlqr_carver_cancel\fR(3)
49
-.SH "COPYRIGHT"
50
-Copyright \(co 2007-2009 Carlo Baldassi
51
-.br

+ 5
- 1
man/Makefile.in View File

@@ -113,6 +113,7 @@ MAINT = @MAINT@
113 113
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
114 114
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
115 115
 MAKEINFO = @MAKEINFO@
116
+MANIFEST_TOOL = @MANIFEST_TOOL@
116 117
 NM = @NM@
117 118
 NMEDIT = @NMEDIT@
118 119
 OBJDUMP = @OBJDUMP@
@@ -124,15 +125,19 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
124 125
 PACKAGE_NAME = @PACKAGE_NAME@
125 126
 PACKAGE_STRING = @PACKAGE_STRING@
126 127
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
128
+PACKAGE_URL = @PACKAGE_URL@
127 129
 PACKAGE_VERSION = @PACKAGE_VERSION@
128 130
 PATH_SEPARATOR = @PATH_SEPARATOR@
129 131
 PKG_CONFIG = @PKG_CONFIG@
132
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
133
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
130 134
 RANLIB = @RANLIB@
131 135
 SED = @SED@
132 136
 SET_MAKE = @SET_MAKE@
133 137
 SHELL = @SHELL@
134 138
 STRIP = @STRIP@
135 139
 VERSION = @VERSION@
140
+ac_ct_AR = @ac_ct_AR@
136 141
 ac_ct_CC = @ac_ct_CC@
137 142
 ac_ct_CXX = @ac_ct_CXX@
138 143
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -169,7 +174,6 @@ libdir = @libdir@
169 174
 libexecdir = @libexecdir@
170 175
 localedir = @localedir@
171 176
 localstatedir = @localstatedir@
172
-lt_ECHO = @lt_ECHO@
173 177
 mandir = @mandir@
174 178
 mkdir_p = @mkdir_p@
175 179
 oldincludedir = @oldincludedir@

+ 0
- 66
man/lqr_carver_attach.3 View File

@@ -1,66 +0,0 @@
1
-.\"     Title: \fBlqr_carver_attach\fR
2
-.\"    Author: Carlo Baldassi
3
-.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
4
-.\"      Date: 10 Maj 2009
5
-.\"    Manual: LqR library API reference
6
-.\"    Source: LqR library 0.4.1 API (3:1:3)
7
-.\"
8
-.TH "\FBLQR_CARVER_ATTACH\FR" "3" "10 Maj 2009" "LqR library 0.4.1 API (3:1:3)" "LqR library API reference"
9
-.\" disable hyphenation
10
-.nh
11
-.\" disable justification (adjust text to left margin only)
12
-.ad l
13
-.SH "NAME"
14
-lqr_carver_attach \- attach an LqrCarver to another LqrCarver
15
-.SH "SYNOPSIS"
16
-.sp
17
-.ft B
18
-.nf
19
-#include <lqr\&.h>
20
-.fi
21
-.ft
22
-.HP 28
23
-.BI "LqrRetVal lqr_carver_attach(LqrCarver*\ " "carver" ", LqrCarver*\ " "aux" ");"
24
-.SH "DESCRIPTION"
25
-.PP
26
-The function
27
-\fBlqr_carver_attach\fR
28
-is used to attach an
29
-LqrCarver
30
-object (pointed to by
31
-\fIaux\fR) to another one (pointed to by
32
-\fIcarver\fR)\&. This will have the effect that each operation performed over the
33
-\fIcarver\fR
34
-object will be reflected on
35
-\fIaux\fR
36
-(they will share the same visibility map)\&.
37
-.PP
38
-This function must not be used after a visibility map was loaded into the base object (the one pointed to by
39
-\fIcarver\fR)\&.
40
-.PP
41
-The object pointed to by
42
-\fIaux\fR
43
-must have the same original size as the base object\&. Note that the original size information is reset whenever a flattening operation occurs, or the rescaling direction changes, so that this function should be called befor rescaling occurs\&.
44
-.PP
45
-There is no limitation on the number of
46
-LqrCarver
47
-objects which is possible to attach\&. Nesting is also possible\&. It is irrelevant if the
48
-\fIaux\fR
49
-carver is initialised or not; from the moment of attachment, it will passively undergo all transformations performed over
50
-\fIcarver\fR\&.
51
-.SH "RETURN VALUE"
52
-.PP
53
-The return value follows the Liquid Rescale library signalling system\&.
54
-\fBLQR_ERROR\fR
55
-is returned if the sizes of
56
-\fIcarver\fR
57
-and
58
-\fIaux\fR
59
-don\'t match\&.
60
-.SH "SEE ALSO"
61
-.PP
62
-
63
-\fBLqrRetVal\fR(3), \fBlqr_carver_list_start\fR(3), \fBlqr_carver_list_current\fR(3), \fBlqr_carver_list_next\fR(3), \fBlqr_carver_list_foreach\fR(3)
64
-.SH "COPYRIGHT"
65
-Copyright \(co 2007-2009 Carlo Baldassi
66
-.br

+ 0
- 1
man/lqr_carver_bias_add.3 View File

@@ -1 +0,0 @@
1
-.so man3/lqr_carver_bias_add_xy.3

+ 0
- 1
man/lqr_carver_bias_add_area.3 View File

@@ -1 +0,0 @@
1
-.so man3/lqr_carver_bias_add_xy.3

+ 0
- 1
man/lqr_carver_bias_add_rgb.3 View File

@@ -1 +0,0 @@
1
-.so man3/lqr_carver_bias_add_xy.3

+ 0
- 1
man/lqr_carver_bias_add_rgb_area.3 View File

@@ -1 +0,0 @@
1
-.so man3/lqr_carver_bias_add_xy.3

+ 0
- 125
man/lqr_carver_bias_add_xy.3 View File

@@ -1,125 +0,0 @@
1
-.\"     Title: \fBlqr_carver_bias_add\fR
2
-.\"    Author: Carlo Baldassi
3
-.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
4
-.\"      Date: 10 Maj 2009
5
-.\"    Manual: LqR library API reference
6
-.\"    Source: LqR library 0.4.1 API (3:1:3)
7
-.\"
8
-.TH "\FBLQR_CARVER_BIAS_ADD\FR" "3" "10 Maj 2009" "LqR library 0.4.1 API (3:1:3)" "LqR library API reference"
9
-.\" disable hyphenation
10
-.nh
11
-.\" disable justification (adjust text to left margin only)
12
-.ad l
13
-.SH "NAME"
14
-lqr_carver_bias_add_xy, lqr_carver_bias_add_area, lqr_carver_bias_add, lqr_carver_bias_add_rgb_area, lqr_carver_bias_add_rgb \- update an LqrCarver bias
15
-.SH "SYNOPSIS"
16
-.sp
17
-.ft B
18
-.nf
19
-#include <lqr\&.h>
20
-.fi
21
-.ft
22
-.HP 33
23
-.BI "LqrRetVal lqr_carver_bias_add_xy(LqrCarver*\ " "carver" ", gdouble\ " "bias" ", gint\ " "x" ", gint\ " "y" ");"
24
-.HP 35
25
-.BI "LqrRetVal lqr_carver_bias_add_area(LqrCarver*\ " "carver" ", gdouble*\ " "buffer" ", gint\ " "bias_factor" ", gint\ " "width" ", gint\ " "height" ", gint\ " "x_off" ", gint\ " "y_off" ");"
26
-.HP 30
27
-.BI "LqrRetVal lqr_carver_bias_add(LqrCarver*\ " "carver" ", gdouble*\ " "buffer" ", gint\ " "bias_factor" ");"
28
-.HP 39
29
-.BI "LqrRetVal lqr_carver_bias_add_rgb_area(LqrCarver*\ " "carver" ", gdouble*\ " "buffer" ", gint\ " "bias_factor" ", gint\ " "channels" ", gint\ " "width" ", gint\ " "height" ", gint\ " "x_off" ", gint\ " "y_off" ");"
30
-.HP 34
31
-.BI "LqrRetVal lqr_carver_bias_add_rgb(LqrCarver*\ " "carver" ", gdouble*\ " "buffer" ", gint\ " "bias_factor" ", gint\ " "channels" ");"
32
-.SH "FOREWORD"
33
-.PP
34
-All the functions described in this page are used to add a bias to
35
-LqrCarver
36
-objects\&. A positive biased pixel will be more likely to be avoided by seams, and thus be preserved during rescaling, while a negative bias has the opposite effect\&.
37
-.PP
38
-All of these functions must be called before
39
-\fBlqr_carver_resize\fR(3)\&. If called multiple times, the biases added at each call will sum up\&.
40
-.SH "ADDING A BIAS PIXEL BY PIXEL"
41
-.PP
42
-The function
43
-\fBlqr_carver_bias_add_xy\fR
44
-adds a bias to the
45
-\fIx\fR,
46
-\fIy\fR
47
-pixel of the image loaded into the
48
-LqrCarver
49
-object pointed to by
50
-\fIcarver\fR
51
-.PP
52
-A typical value for
53
-\fIbias_factor\fR
54
-would be
55
-1000
56
-(in absolute value)\&.
57
-.SH "ADDING A BIAS FROM A BUFFER"
58
-.PP
59
-The function
60
-\fBlqr_carver_bias_add_area\fR
61
-adds a bias to an area of the image loaded into the
62
-LqrCarver
63
-object pointed to by
64
-\fIcarver\fR\&.
65
-.PP
66
-The parameter
67
-\fIbuffer\fR
68
-must point to an array of
69
-\fBdoubles\fR
70
-of size
71
-\fIwidth\fR * \fIheight\fR, ordered first by rows, then by columns\&.
72
-.PP
73
-The offset of the area relative to the image can be specified through
74
-\fIx_off\fR
75
-and
76
-\fIy_off\fR\&. The bias area can exceed the boundary of the image, and the offsets can be negative\&.
77
-.PP
78
-The parameter
79
-\fIbias_factor\fR
80
-is an overall bias scale\&. A typical value when the buffer contents are of the order of
81
-1
82
-would be
83
-1000
84
-(in absolute value)\&.
85
-.PP
86
-The function
87
-\fBlqr_carver_bias_add\fR
88
-can be used when the area to add is of the same size of the image loaded in the
89
-LqrCarver
90
-object and the offsets are
91
-0\&.
92
-.SH "ADDING A BIAS FROM AN IMAGE"
93
-.PP
94
-The functions
95
-\fBlqr_carver_bias_add_rgb_area\fR
96
-and
97
-\fBlqr_carver_bias_add_rgb\fR
98
-are very similar to
99
-\fBlqr_carver_bias_add_area\fR
100
-and
101
-\fBlqr_carver_bias_add\fR, except that they use 8\-bit multi\-channel images as inputs\&.
102
-.PP
103
-The number of channels in the image is passed via the parameter
104
-\fIchannels\fR\&. The last channel is assumed to be the alpha (opacity) channel if
105
-\fIchannels\fR
106
-is equal to
107
-2
108
-or greater than
109
-3
110
-(if this is not t