1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291
|
diff -ubrN volpack-1.0b3.orig/AUTHORS volpack-1.0b3/AUTHORS
--- volpack-1.0b3.orig/AUTHORS 1970-01-01 01:00:00.000000000 +0100
+++ volpack-1.0b3/AUTHORS 2007-07-28 21:37:35.000000000 +0200
@@ -0,0 +1,3 @@
+Phil Lacroute
+volpack@graphics.stanford.edu
+16 December 1994
diff -ubrN volpack-1.0b3.orig/ChangeLog volpack-1.0b3/ChangeLog
--- volpack-1.0b3.orig/ChangeLog 1970-01-01 01:00:00.000000000 +0100
+++ volpack-1.0b3/ChangeLog 1994-12-31 00:52:30.000000000 +0100
@@ -0,0 +1,110 @@
+--------------- Released version 1.0 beta1 ---------------
+
+1. Bug Fix: vpCreateMinMaxOctree caused a segmentation fault for
+ volume sizes that were not a power of two.
+
+2. Debug Feature: Added debugging code for compositing calculation.
+
+3. Debug Feature: Added intermediate image coordinates to vpTracePixel
+ output.
+
+4. Bug Fix: Added a check in vpRamp for non-increasing x coordinates
+ to prevent a divide-by-zero error.
+
+5. Bug Fix: Added a version of the compositing routine (vp_compAn.m4)
+ that does not have unrolled loops, since some compilers have
+ trouble with the unrolled version (too many basic blocks to run the
+ optimizer in a reasonable amount of time). The unrolled version is
+ now in vp_compAu.m4 instead of vp_compA.m4. The Makefile can be
+ modified to choose one or the other version.
+
+6. Feature: Added complete man pages for all library routines.
+
+7. Bug Fix: In vpSetCallback, revert to default behavior if the function
+ argument is NULL (instead of causing a NULL dereference later on).
+
+8. Feature: Added vpStoreContext and vpLoadContext to save and restore
+ rendering contexts (and to make it easier to reproduce bugs).
+
+9. Feature: Changed vpLoadRawVolume to memory-map the file if
+ requested
+
+10. Bug Fix: Fixed missing and incorrect function prototypes.
+
+11. Feature: Changed makefile and headers to use GNU autoconf.
+
+--------------- Released version 1.0 beta2 ---------------
+
+12. Bug Fix: Fixed minus-sign error in formula for depth cueing factor.
+ This eliminates the brightness changes that occurred when rotating
+ a volume past a 45 degree point with depth cueing enabled.
+
+13. Debug Feature: Added code to collect rendering statistics for
+ performance analysis.
+
+14. Debug Feature: Allow negative opacity threshold (to experiment with
+ disabling the benefit of spatial data structures).
+
+15. Bug Fix: Fixed the result of vpGeti with the VP_VIEW_Y_SIZE
+ or VP_VIEW_Z_SIZE options.
+
+16. Reorganization and renaming of compositing functions to make it
+ easier to conditionally compile in just some of the special-case
+ versions. Also merged code for unrolled loops with code for
+ non-unrolled loops into one M4 source file.
+
+17. Feature: Added experimental "index volume" code for faster
+ early-ray termination.
+
+18. Debug Feature: Added define flags to conditionally remove early-ray
+ termination and resampling loops for performance analysis runs.
+
+19. Feature: Added experimental brute-force raycaster for performance
+ comparisons.
+
+20. Feature: Implemented shadows.
+
+21. Bug Fix: Added missing return value in vpDestroyClassifiedVolume.
+
+22. Feature: Implemented resampling filters for scaling volume data
+ (vpSetFilter(), vpResample(), vpBoxFilter(), vpLinearFilter(),
+ vpBicubicFilter(), vpGaussianFilter()).
+
+23. Feature: Added capability to produce images with a variety of
+ pixel formats, including an optional alpha channel.
+ *** INCOMPATIBLE CHANGE TO vpSetImage ***
+
+24. Feature: Changed vpGetImage to produce images with the same
+ pixel formats supported by vpSetImage, and to allow reading back
+ the shadow buffer.
+ *** INCOMPATIBLE CHANGE TO vpGetImage ***
+
+25. Reorganized macros in vp_compA.m4 and vp_warpA.m4.
+
+26. Bug Fix: Refactor view if shadows are turned on.
+
+27. Feature: The callback functions for VP_LOG_ALLOC_FUNC,
+ VP_LOG_FREE_FUNC and VP_STATUS_FUNC now get one additional
+ argument, the client_data pointer associated with the context.
+
+28. Bug Fix: Check if intermediate image buffer must be resized
+ even if view has not changed (since number of color channels
+ may be different).
+
+29. Feature: Allow clamping to be disabled when computing shading
+ lookup table (vpShadeTable).
+
+30. Debug Feature: Added options to override default compositing direction
+ and to retrieve compositing order.
+
+31. Bug Fix: Check for invalid voxel field sizes when using lookup
+ table shading.
+
+32. Bug Fix: Don't destroy classified volume when raw voxel array
+ is set to NULL pointer.
+
+33. Bug Fix: Fixed error in vpNormalIndex (also affecting
+ vpScanlineNormals and vpVolumeNormals) that resulted in incorrect
+ calculation of isolated surface normals due to a roundoff error.
+ This sometimes also resulted in index values greater than the
+ maximum permissible value.
diff -ubrN volpack-1.0b3.orig/changes volpack-1.0b3/changes
--- volpack-1.0b3.orig/changes 1994-12-31 00:52:30.000000000 +0100
+++ volpack-1.0b3/changes 1970-01-01 01:00:00.000000000 +0100
@@ -1,110 +0,0 @@
---------------- Released version 1.0 beta1 ---------------
-
-1. Bug Fix: vpCreateMinMaxOctree caused a segmentation fault for
- volume sizes that were not a power of two.
-
-2. Debug Feature: Added debugging code for compositing calculation.
-
-3. Debug Feature: Added intermediate image coordinates to vpTracePixel
- output.
-
-4. Bug Fix: Added a check in vpRamp for non-increasing x coordinates
- to prevent a divide-by-zero error.
-
-5. Bug Fix: Added a version of the compositing routine (vp_compAn.m4)
- that does not have unrolled loops, since some compilers have
- trouble with the unrolled version (too many basic blocks to run the
- optimizer in a reasonable amount of time). The unrolled version is
- now in vp_compAu.m4 instead of vp_compA.m4. The Makefile can be
- modified to choose one or the other version.
-
-6. Feature: Added complete man pages for all library routines.
-
-7. Bug Fix: In vpSetCallback, revert to default behavior if the function
- argument is NULL (instead of causing a NULL dereference later on).
-
-8. Feature: Added vpStoreContext and vpLoadContext to save and restore
- rendering contexts (and to make it easier to reproduce bugs).
-
-9. Feature: Changed vpLoadRawVolume to memory-map the file if
- requested
-
-10. Bug Fix: Fixed missing and incorrect function prototypes.
-
-11. Feature: Changed makefile and headers to use GNU autoconf.
-
---------------- Released version 1.0 beta2 ---------------
-
-12. Bug Fix: Fixed minus-sign error in formula for depth cueing factor.
- This eliminates the brightness changes that occurred when rotating
- a volume past a 45 degree point with depth cueing enabled.
-
-13. Debug Feature: Added code to collect rendering statistics for
- performance analysis.
-
-14. Debug Feature: Allow negative opacity threshold (to experiment with
- disabling the benefit of spatial data structures).
-
-15. Bug Fix: Fixed the result of vpGeti with the VP_VIEW_Y_SIZE
- or VP_VIEW_Z_SIZE options.
-
-16. Reorganization and renaming of compositing functions to make it
- easier to conditionally compile in just some of the special-case
- versions. Also merged code for unrolled loops with code for
- non-unrolled loops into one M4 source file.
-
-17. Feature: Added experimental "index volume" code for faster
- early-ray termination.
-
-18. Debug Feature: Added define flags to conditionally remove early-ray
- termination and resampling loops for performance analysis runs.
-
-19. Feature: Added experimental brute-force raycaster for performance
- comparisons.
-
-20. Feature: Implemented shadows.
-
-21. Bug Fix: Added missing return value in vpDestroyClassifiedVolume.
-
-22. Feature: Implemented resampling filters for scaling volume data
- (vpSetFilter(), vpResample(), vpBoxFilter(), vpLinearFilter(),
- vpBicubicFilter(), vpGaussianFilter()).
-
-23. Feature: Added capability to produce images with a variety of
- pixel formats, including an optional alpha channel.
- *** INCOMPATIBLE CHANGE TO vpSetImage ***
-
-24. Feature: Changed vpGetImage to produce images with the same
- pixel formats supported by vpSetImage, and to allow reading back
- the shadow buffer.
- *** INCOMPATIBLE CHANGE TO vpGetImage ***
-
-25. Reorganized macros in vp_compA.m4 and vp_warpA.m4.
-
-26. Bug Fix: Refactor view if shadows are turned on.
-
-27. Feature: The callback functions for VP_LOG_ALLOC_FUNC,
- VP_LOG_FREE_FUNC and VP_STATUS_FUNC now get one additional
- argument, the client_data pointer associated with the context.
-
-28. Bug Fix: Check if intermediate image buffer must be resized
- even if view has not changed (since number of color channels
- may be different).
-
-29. Feature: Allow clamping to be disabled when computing shading
- lookup table (vpShadeTable).
-
-30. Debug Feature: Added options to override default compositing direction
- and to retrieve compositing order.
-
-31. Bug Fix: Check for invalid voxel field sizes when using lookup
- table shading.
-
-32. Bug Fix: Don't destroy classified volume when raw voxel array
- is set to NULL pointer.
-
-33. Bug Fix: Fixed error in vpNormalIndex (also affecting
- vpScanlineNormals and vpVolumeNormals) that resulted in incorrect
- calculation of isolated surface normals due to a roundoff error.
- This sometimes also resulted in index values greater than the
- maximum permissible value.
diff -ubrN volpack-1.0b3.orig/config.h.in volpack-1.0b3/config.h.in
--- volpack-1.0b3.orig/config.h.in 1994-09-25 19:50:42.000000000 +0100
+++ volpack-1.0b3/config.h.in 2007-08-04 21:21:18.000000000 +0200
@@ -1,16 +1,64 @@
-/* config.h.in. Generated automatically from configure.in by autoheader. */
+/* config.h.in. Generated from configure.in by autoheader. */
-/* Define if you don't have vprintf but do have _doprnt. */
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
#undef HAVE_DOPRNT
-/* Define if you have the vprintf function. */
-#undef HAVE_VPRINTF
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
-/* Define if you have the <memory.h> header file. */
+/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
-/* Define if you have the <string.h> header file. */
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the `vprintf' function. */
+#undef HAVE_VPRINTF
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
diff -ubrN volpack-1.0b3.orig/configure.in volpack-1.0b3/configure.in
--- volpack-1.0b3.orig/configure.in 1994-12-15 21:11:34.000000000 +0100
+++ volpack-1.0b3/configure.in 2007-08-04 21:21:01.000000000 +0200
@@ -1,8 +1,35 @@
dnl This file is an input file used by the GNU "autoconf" program to
dnl generate the file "configure", which is run during installation
dnl to configure the system for the local environment.
-AC_INIT(vp_global.h)
-AC_CONFIG_HEADER(config.h)
+dnl
+dnl Authors:
+dnl Andreas Tille <tille@debian.org> and Daniel Leidert <daniel.leidert@wgdd.de>
+dnl License: GPL
+
+dnl Initialize autoconf by any header file of the source
+dnl
+
+AC_INIT([volpack], [1.0b3], [volpack@graphics.stanford.edu])
+AC_PREREQ([2.54])
+AC_CONFIG_SRCDIR([volpack.h])
+
+dnl Define the library SONAME. You can create the different numbers from VERSION
+dnl if you want (probably awk, ...)
+dnl
+
+LIBVOLPACK_MAJOR=1
+LIBVOLPACK_MINOR=1
+LIBVOLPACK_MICRO=0
+
+AC_SUBST(LIBVOLPACK_VERSION_INFO, [$LIBVOLPACK_MAJOR:$LIBVOLPACK_MINOR:$LIBVOLPACK_MICRO])
+
+dnl This configures autoheader to generate a config.h file
+dnl
+
+AM_CONFIG_HEADER([config.h])
+
+AM_INIT_AUTOMAKE([-Wall])
+AM_PROG_LIBTOOL
AC_CANONICAL_HOST
@@ -33,13 +60,15 @@
MFLAGS=
;;
esac
-AC_SUBST(OFLAGS)
-AC_SUBST(MFLAGS)
+AC_SUBST([OFLAGS])
+AC_SUBST([MFLAGS])
+dnl AC_PROG_LIBTOOL
+AC_PROG_CC
+dnl CC=${CC-cc}
+dnl AC_SUBST(CC)
+AC_PROG_CPP
AC_PROG_INSTALL
-AC_PROG_RANLIB
-CC=${CC-cc}
-AC_SUBST(CC)
if test -z "$M4" ; then
case "$host" in
@@ -51,10 +80,20 @@
;;
esac
fi
-AC_PATH_PROGS(M4, gnum4 gm4 m4, m4)
+AC_PATH_PROGS([M4], [gnum4 gm4 m4])
+test -n "$M4" || AC_MSG_ERROR([m4 is missing on your system or not present in PATH.])
AC_HEADER_STDC
-AC_CHECK_HEADERS(string.h memory.h)
+AC_CHECK_HEADERS([string.h memory.h])
+
+AC_CHECK_LIB([m], [cos])
AC_FUNC_VPRINTF
-AC_OUTPUT(Makefile examples/Makefile)
+AC_CONFIG_FILES([
+ Makefile
+ doc/Makefile
+ examples/Makefile
+ man/Makefile
+ man/src/Makefile
+])
+AC_OUTPUT
diff -ubrN volpack-1.0b3.orig/COPYING volpack-1.0b3/COPYING
--- volpack-1.0b3.orig/COPYING 1970-01-01 01:00:00.000000000 +0100
+++ volpack-1.0b3/COPYING 2007-07-28 21:17:53.000000000 +0200
@@ -0,0 +1,19 @@
+ VolPack version 1.0beta3
+ ------------------------
+Copyright
+
+VolPack is covered by the following copyright notice:
+
+ Copyright (c) 1994 The Board of Trustees of The Leland Stanford
+ Junior University. All rights reserved.
+
+ Permission to use, copy, modify and distribute this software and its
+ documentation for any purpose is hereby granted without fee, provided
+ that the above copyright notice and this permission notice appear in
+ all copies of this software and that you do not sell the software.
+ Commercial licensing is available by contacting the author.
+
+ THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
diff -ubrN volpack-1.0b3.orig/doc/Makefile.am volpack-1.0b3/doc/Makefile.am
--- volpack-1.0b3.orig/doc/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ volpack-1.0b3/doc/Makefile.am 2007-07-28 21:07:43.000000000 +0200
@@ -0,0 +1,6 @@
+## Process this file with automake to produce Makefile.in
+# Makefile.am for volpack/doc
+# Andreas Tille <tille@debian.org>
+# GPL
+
+EXTRA_DIST = vp_userguide.html vp_userguide.ps
diff -ubrN volpack-1.0b3.orig/examples/Makefile.am volpack-1.0b3/examples/Makefile.am
--- volpack-1.0b3.orig/examples/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ volpack-1.0b3/examples/Makefile.am 2007-08-03 21:50:34.000000000 +0200
@@ -0,0 +1,24 @@
+## Process this file with automake to produce Makefile.in
+# Makefile.am for volpack/examples
+# Andreas Tille <tille@debian.org> and Daniel Leidert <daniel.leidert@wgdd.de>
+# GPL
+
+EXTRA_DIST = brainsmall.den check.ppm README test.csh
+
+CLEANFILES = $(EXAMPLEOUTPUT)
+
+AM_CPPFLAGS = -I$(top_srcdir)
+LDADD = $(top_builddir)/libvolpack.la @LIBS@
+
+noinst_PROGRAMS = classifyvolume makeoctree makevolume rendervolume scalevolume
+
+classifyvolume_SOURCES = classifyvolume.c volume.h
+makeoctree_SOURCES = makeoctree.c volume.h
+makevolume_SOURCES = makevolume.c volume.h
+rendervolume_SOURCES = rendervolume.c volume.h
+scalevolume_SOURCES = scalevolume.c denfile.c
+
+# In case there are some remainings from the example tests:
+EXAMPLEOUTPUT = brainsmall.cv brainsmall.oct brainsmall*.ppm brainsmall.rv
+
+
diff -ubrN volpack-1.0b3.orig/examples/Makefile.in volpack-1.0b3/examples/Makefile.in
--- volpack-1.0b3.orig/examples/Makefile.in 1995-01-01 01:01:41.000000000 +0100
+++ volpack-1.0b3/examples/Makefile.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,116 +0,0 @@
-#
-# Makefile for VolPack example programs. If it has the name "Makefile.in"
-# then it is a template for a Makefile; to generate the actual Makefile,
-# run "./configure", which is a configuration script generated by the
-# "autoconf" program (constructs like "@foo@" will get replaced in the
-# actual Makefile).
-#
-# Copyright (c) 1994 The Board of Trustees of The Leland Stanford
-# Junior University. All rights reserved.
-#
-# Permission to use, copy, modify and distribute this software and its
-# documentation for any purpose is hereby granted without fee, provided
-# that the above copyright notice and this permission notice appear in
-# all copies of this software and that you do not sell the software.
-# Commercial licensing is available by contacting the author.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-#
-# Author:
-# Phil Lacroute
-# Computer Systems Laboratory
-# Electrical Engineering Dept.
-# Stanford University
-#
-
-# shell to use for executing make commands
-SHELL = /bin/sh
-
-###########################################################################
-# Options that can be changed by the user.
-###########################################################################
-
-# ANSI-C prototypes: use the first line to let the #ifdef's in
-# volpack.h guess if your compiler supports prototypes, use the
-# second line to disable prototypes, or use the third line to
-# enable prototypes
-PROTO_FLAG =
-#PROTO_FLAG = -DNO_PROTOTYPE
-#PROTO_FLAG = -DANSI_C
-
-# optional compiler flags: use the first line for full optimization
-# (configure will try to choose flags for your system), or use the
-# second for no optimization; the other lines are for various levels
-# of debugging
-CCOPT_FLAGS = $(OFLAGS)
-#CCOPT_FLAGS =
-#CCOPT_FLAGS = -DASSERTIONS -fullwarn -g
-
-# directory containing volpack
-VOLPACK = ..
-
-# include files for volpack
-VPINCL = -I$(VOLPACK)
-
-# library for volpack
-VPLIB = $(VOLPACK)/libvolpack.a
-
-###########################################################################
-# Options that are changed by the configure script. These should
-# probably not be editted by hand.
-###########################################################################
-
-# pathname for the C compiler
-CC = @CC@
-
-# compiler options
-AC_FLAGS = @DEFS@
-
-# system-dependent options based on system name passed to configure;
-# this macro is for options that should always be included (even for
-# compiles with optimization turned off); configure can fill
-# this in automatically if you supply a recognized system name
-MFLAGS = @MFLAGS@
-
-# system-dependent options based on system name passed to configure;
-# this macro is for optimization options only; configure can fill
-# this in automatically if you supply a recognized system name
-OFLAGS = @OFLAGS@
-
-###########################################################################
-# Nothing beyond this point should need to be changed by the user.
-###########################################################################
-
-CFLAGS = -I. ${VPINCL} ${AC_FLAGS} ${CCOPT_FLAGS} ${MFLAGS} ${PROTO_FLAG}
-LIBS = ${VPLIB} -lm
-
-all: makevolume makeoctree classifyvolume rendervolume scalevolume
-
-makevolume: makevolume.c volume.h $(VPLIB)
- $(CC) -o makevolume $(CFLAGS) makevolume.c $(LIBS)
-
-makeoctree: makeoctree.c volume.h $(VPLIB)
- $(CC) -o makeoctree $(CFLAGS) makeoctree.c $(LIBS)
-
-classifyvolume: classifyvolume.c volume.h $(VPLIB)
- $(CC) -o classifyvolume $(CFLAGS) classifyvolume.c $(LIBS)
-
-rendervolume: rendervolume.c volume.h $(VPLIB)
- $(CC) -o rendervolume $(CFLAGS) rendervolume.c $(LIBS)
-
-scalevolume: scalevolume.c denfile.c $(VPLIB)
- $(CC) -o scalevolume $(CFLAGS) scalevolume.c denfile.c $(LIBS)
-
-checkin:
- ci -l -f classifyvolume.c makeoctree.c makevolume.c \
- rendervolume.c scalevolume.c denfile.c volume.h \
- Makefile.in test.csh test.out README
-
-clean:
- rm -f makevolume makeoctree classifyvolume rendervolume scalevolume
- rm -f scalevolume.o denfile.o
- rm -f brainsmall.rv brainsmall.oct brainsmall.cv brainsmall.ppm
- rm -f brainsmall1.ppm brainsmall2.ppm
- rm -f brainsmall3.ppm brainsmall4.ppm
diff -ubrN volpack-1.0b3.orig/INSTALL volpack-1.0b3/INSTALL
--- volpack-1.0b3.orig/INSTALL 1970-01-01 01:00:00.000000000 +0100
+++ volpack-1.0b3/INSTALL 2006-10-19 06:51:14.000000000 +0200
@@ -0,0 +1,234 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006 Free Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about. Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+ Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff -ubrN volpack-1.0b3.orig/Makefile.am volpack-1.0b3/Makefile.am
--- volpack-1.0b3.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ volpack-1.0b3/Makefile.am 2007-09-22 22:02:22.000000000 +0200
@@ -0,0 +1,60 @@
+## Process this file with automake to produce Makefile.in
+# Makefile.am for volpack
+# Andreas Tille <tille@debian.org> and Daniel Leidert <daniel.leidert@wgdd.de>
+# GPL
+
+SUBDIRS = doc man examples
+
+EXTRA_DIST = no_edit_header vp_compA.m4 vp_warpA.m4 makeopts
+
+CLEANFILES = $(COMP_SRCS) $(WARP_SRCS) vp_opts.c
+
+AM_CFLAGS = $(AC_FLAGS) $(CCOPT_FLAGS) $(MFLAGS) \
+ $(PROTO_FLAG) $(UNROLL_FLAG) $(OPT_FLAGS)
+AM_LDFLAGS = -version-info @LIBVOLPACK_VERSION_INFO@
+
+# Make sure, the library and source files are build first.
+BUILT_SOURCES = vp_opts.c $(COMP_SRCS) $(WARP_SRCS) $(lib_LTLIBRARIES)
+
+lib_LTLIBRARIES = libvolpack.la
+
+dist_libvolpack_la_SOURCES = volpack.h vp_global.h patchlevel.h \
+ vp_check.c vp_context.c vp_extract.c vp_file.c vp_linalg.c vp_octree.c \
+ vp_renderA.c vp_renderB.c vp_renderC.c vp_renderR.c vp_resample.c \
+ vp_rle.c vp_shade.c vp_transpose.c vp_util.c vp_view.c vp_warp.c
+nodist_libvolpack_la_SOURCES = $(COMP_SRCS) $(WARP_SRCS)
+
+vp_opts.c: makeopts Makefile
+ ./makeopts vp_opts.c $(CFLAGS)
+
+# list of optional C source files to build with code specialized
+# for particular shaders and resampling filters
+OPT_SRCS = vp_compAC11B.c vp_compAC31B.c vp_compAC32B.c \
+ vp_compAR11B.c vp_compAR31B.c vp_compAR32B.c
+
+# C define flags corresponding to COMP_SRCS; these tell the dispatch
+# routines in the library which object files are available
+OPT_FLAGS = -DCOMP_AC11B -DCOMP_AC31B -DCOMP_AC32B \
+ -DCOMP_AR11B -DCOMP_AR31B -DCOMP_AR32B
+
+COMP_SRCS = vp_compAC1NB.c vp_compAC3NB.c vp_compAR1NB.c vp_compAR3NB.c \
+ vp_compAC1PB.c vp_compAC3PB.c vp_compAR1PB.c vp_compAR3PB.c \
+ vp_compAC00G.c vp_compAR00G.c vp_compAC1NS.c vp_compAC3NS.c \
+ vp_compAR1NS.c vp_compAR3NS.c $(OPT_SRCS)
+
+WARP_SRCS = vp_warpA101N.c vp_warpA301N.c vp_warpA110N.c vp_warpA111N.c \
+ vp_warpA330N.c vp_warpA331N.c vp_warpA330R.c vp_warpA331R.c
+
+COMP_IN = no_edit_header vp_compA.m4
+WARP_IN = no_edit_header vp_warpA.m4
+
+ESRC = vp_raycast.c
+EOBJ = vp_raycast.o
+
+$(COMP_SRCS): $(COMP_IN)
+ $(M4) -DSourceFile=$@ $^ > $@
+
+$(WARP_SRCS): $(WARP_IN)
+ $(M4) -DSourceFile=$@ $^ > $@
+
+MAINTAINERCLEANFILES = autom4te.cache
diff -ubrN volpack-1.0b3.orig/Makefile.in volpack-1.0b3/Makefile.in
--- volpack-1.0b3.orig/Makefile.in 1994-12-12 21:21:47.000000000 +0100
+++ volpack-1.0b3/Makefile.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,261 +0,0 @@
-#
-# Makefile for the VolPack library. If it has the name "Makefile.in"
-# then it is a template for a Makefile; to generate the actual Makefile,
-# run "./configure", which is a configuration script generated by the
-# "autoconf" program (constructs like "@foo@" will get replaced in the
-# actual Makefile).
-#
-# Copyright (c) 1994 The Board of Trustees of The Leland Stanford
-# Junior University. All rights reserved.
-#
-# Permission to use, copy, modify and distribute this software and its
-# documentation for any purpose is hereby granted without fee, provided
-# that the above copyright notice and this permission notice appear in
-# all copies of this software and that you do not sell the software.
-# Commercial licensing is available by contacting the author.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-# WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-#
-# Author:
-# Phil Lacroute
-# Computer Systems Laboratory
-# Electrical Engineering Dept.
-# Stanford University
-#
-
-# shell to use for executing make commands
-SHELL = /bin/sh
-
-###########################################################################
-# Options that can be changed by the user.
-###########################################################################
-
-# default top-level directory for installing architecture-independent files
-# (include files, documentation)
-prefix = @prefix@
-
-# default top-level directory for installing architecture-specific files
-# (binaries)
-exec_prefix = @exec_prefix@
-
-# directory in which to install the VolPack library
-LIB_DIR = $(exec_prefix)/lib
-
-# directory for include files
-INCLUDE_DIR = $(prefix)/include
-
-# top-level directory for manual entries
-MAN_DIR = $(prefix)/man
-
-# directory in which to install manual entries for library functions
-MAN3_DIR = $(MAN_DIR)/man3
-
-# ANSI-C prototypes: use the first line to let the #ifdef's in
-# volpack.h guess if your compiler supports prototypes, use the
-# second line to disable prototypes, or use the third line to
-# enable prototypes
-PROTO_FLAG =
-#PROTO_FLAG = -DNO_PROTOTYPE
-#PROTO_FLAG = -DANSI_C
-
-# loop unrolling optimization: if the following line is not commented
-# out then the library will be built with a special version of the
-# rendering code that has been hand-optimized; use this unless your
-# compiler's optimizer has trouble with procedures that have a large
-# number of basic blocks
-#UNROLL_FLAG = -DUNROLL_RUN_LOOP
-
-# optional compiler flags:
-# use the first line for full optimization
-# use the second line for no optimization
-# the other lines are for various levels of debugging
-CCOPT_FLAGS = $(OFLAGS)
-#CCOPT_FLAGS =
-#CCOPT_FLAGS = -DASSERTIONS -fullwarn -g
-#CCOPT_FLAGS = -DDEBUG -DASSERTIONS -fullwarn -g
-
-# list of optional C source files to build with code specialized
-# for particular shaders and resampling filters
-OPT_SRCS = vp_compAC11B.c vp_compAC31B.c vp_compAC32B.c \
- vp_compAR11B.c vp_compAR31B.c vp_compAR32B.c
-
-# object files corresponding to COMP_SRCS
-OPT_OBJS = vp_compAC11B.o vp_compAC31B.o vp_compAC32B.o \
- vp_compAR11B.o vp_compAR31B.o vp_compAR32B.o
-
-# C define flags corresponding to COMP_SRCS; these tell the dispatch
-# routines in the library which object files are available
-OPT_FLAGS = -DCOMP_AC11B -DCOMP_AC31B -DCOMP_AC32B \
- -DCOMP_AR11B -DCOMP_AR31B -DCOMP_AR32B
-
-###########################################################################
-# Options that are changed by the configure script. These should
-# probably not be editted by hand.
-###########################################################################
-
-# pathname for the C compiler
-CC = @CC@
-
-# pathname for the m4 macro preprocessor; it must understand the -D flag
-# (some BSD versions do not; GNU m4 works)
-M4 = @M4@
-
-# pathname for ranlib if you need it
-RANLIB = @RANLIB@
-
-# commands to use to install files
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-
-# directory containing source code
-SRC_DIR = @srcdir@
-VPATH = @srcdir@
-
-# compiler options
-AC_FLAGS = @DEFS@
-
-# system-dependent options based on system name passed to configure;
-# this macro is for options that should always be included (even for
-# compiles with optimization turned off); configure can fill
-# this in automatically if you supply a recognized system name
-MFLAGS = @MFLAGS@
-
-# system-dependent options based on system name passed to configure;
-# this macro is for optimization options only; configure can fill
-# this in automatically if you supply a recognized system name
-OFLAGS = @OFLAGS@
-
-###########################################################################
-# Nothing beyond this point should need to be changed by the user.
-###########################################################################
-
-CFLAGS = -I. -I$(SRC_DIR) $(AC_FLAGS) $(CCOPT_FLAGS) $(MFLAGS) \
- $(PROTO_FLAG) $(UNROLL_FLAG) $(OPT_FLAGS)
-
-CSRC = vp_check.c vp_context.c vp_extract.c vp_file.c vp_linalg.c vp_octree.c \
- vp_renderA.c vp_renderB.c vp_renderC.c vp_renderR.c vp_resample.c \
- vp_rle.c vp_shade.c vp_transpose.c vp_util.c vp_view.c vp_warp.c
-HSRC = volpack.h vp_global.h patchlevel.h
-MSRC = vp_compA.m4 vp_warpA.m4
-SUPPORT = Makefile.in configure.in no_edit_header makeopts.c
-COMP_SRCS = vp_compAC1NB.c vp_compAC3NB.c vp_compAR1NB.c vp_compAR3NB.c \
- vp_compAC1PB.c vp_compAC3PB.c vp_compAR1PB.c vp_compAR3PB.c \
- vp_compAC00G.c vp_compAR00G.c vp_compAC1NS.c vp_compAC3NS.c \
- vp_compAR1NS.c vp_compAR3NS.c $(OPT_SRCS)
-COMP_OBJS = vp_compAC1NB.o vp_compAC3NB.o vp_compAR1NB.o vp_compAR3NB.o \
- vp_compAC1PB.o vp_compAC3PB.o vp_compAR1PB.o vp_compAR3PB.o \
- vp_compAC00G.o vp_compAR00G.o vp_compAC1NS.o vp_compAC3NS.o \
- vp_compAR1NS.o vp_compAR3NS.o $(OPT_OBJS)
-WARP_SRCS = vp_warpA101N.c vp_warpA301N.c vp_warpA110N.c vp_warpA111N.c \
- vp_warpA330N.c vp_warpA331N.c vp_warpA330R.c vp_warpA331R.c
-WARP_OBJS = vp_warpA101N.o vp_warpA301N.o vp_warpA110N.o vp_warpA111N.o \
- vp_warpA330N.o vp_warpA331N.o vp_warpA330R.o vp_warpA331R.o
-CGEN = vp_opts.c $(COMP_SRCS) $(WARP_SRCS)
-OBJS = vp_check.o vp_context.o vp_extract.o vp_file.o vp_linalg.o vp_octree.o \
- vp_renderA.o vp_renderB.o vp_renderC.o vp_renderR.o vp_resample.o \
- vp_rle.o vp_shade.o vp_transpose.o vp_util.o vp_view.o vp_warp.o \
- vp_opts.o $(COMP_OBJS) $(WARP_OBJS)
-COMP_IN = $(SRC_DIR)/no_edit_header $(SRC_DIR)/vp_compA.m4
-WARP_IN = $(SRC_DIR)/no_edit_header $(SRC_DIR)/vp_warpA.m4
-ESRC = vp_raycast.c
-EOBJ = vp_raycast.o
-
-all: libvolpack.a
-
-libvolpack.a: $(OBJS)
- rm -f libvolpack.a
- ar cr libvolpack.a $(OBJS)
- $(RANLIB) libvolpack.a
-
-$(OBJS): volpack.h vp_global.h config.h
-
-makeopts: makeopts.c
- cc -o makeopts makeopts.c
-
-vp_opts.c: makeopts Makefile
- makeopts vp_opts.c $(CFLAGS)
-
-$(COMP_SRCS): $(COMP_IN)
- @for i in $(COMP_SRCS) ; \
- do \
- rm -f $$i ;\
- echo "$(M4) -DSourceFile=$$i $(COMP_IN) > $$i" ;\
- $(M4) -DSourceFile=$$i $(COMP_IN) > $$i; \
- chmod -w $$i; \
- done
-
-$(WARP_SRCS): $(WARP_IN)
- @for i in $(WARP_SRCS) ; \
- do \
- rm -f $$i ;\
- echo "$(M4) -DSourceFile=$$i $(WARP_IN) > $$i" ;\
- $(M4) -DSourceFile=$$i $(WARP_IN) > $$i; \
- chmod -w $$i; \
- done
-
-examples: libvolpack.a
- cd examples; make
-
-install: install-binaries install-include install-man
-
-install-binaries: libvolpack.a
- @for i in $(LIB_DIR) ; \
- do \
- if [ ! -d $$i ] ; then \
- echo "Making directory $$i"; \
- mkdir $$i ; \
- chmod 755 $$i; \
- else true; \
- fi; \
- done;
- @echo "Installing libvolpack.a"
- @$(INSTALL_DATA) libvolpack.a $(LIB_DIR)
- @$(RANLIB) $(LIB_DIR)/libvolpack.a
-
-install-include:
- @for i in $(INCLUDE_DIR) ; \
- do \
- if [ ! -d $$i ] ; then \
- echo "Making directory $$i"; \
- mkdir $$i ; \
- chmod 755 $$i; \
- else true; \
- fi; \
- done;
- @echo "Installing volpack.h"
- @$(INSTALL_DATA) volpack.h $(INCLUDE_DIR)
-
-install-man:
- @for i in $(MAN_DIR) $(MAN3_DIR) ; \
- do \
- if [ ! -d $$i ] ; then \
- echo "Making directory $$i"; \
- mkdir $$i ; \
- chmod 755 $$i; \
- else true; \
- fi; \
- done;
- @cd $(SRC_DIR)/man/src; for i in *.3; \
- do \
- echo "Installing man/src/$$i"; \
- rm -f $(MAN3_DIR)/$$i; \
- cp $$i $(MAN3_DIR); \
- chmod 444 $(MAN3_DIR)/$$i; \
- done;
-
-Makefile: $(SRC_DIR)/Makefile.in
- ./config.status
-
-mostlyclean:
- rm -f $(OBJS) $(CGEN) makeopts
-
-clean: mostlyclean
- rm -f libvolpack.a
-
-distclean: clean
- rm -f config.status config.log config.cache config.h Makefile
-
-checkin:
- ci -l -f $(CSRC) $(HSRC) $(MSRC) $(ESRC) $(SUPPORT)
diff -ubrN volpack-1.0b3.orig/makeopts volpack-1.0b3/makeopts
--- volpack-1.0b3.orig/makeopts 1970-01-01 01:00:00.000000000 +0100
+++ volpack-1.0b3/makeopts 2007-09-22 21:01:49.000000000 +0200
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# makeopts
+#
+# Create a C source file containing an initialized string with the
+# compiler options used to compile VolPack.
+#
+# Copyright (c) 2007 Andreas Tille
+# Author:
+# Andreas Tille <tille@debian.org>
+# License: BSD
+
+# Usage: makeopts output_file [compiler_options ...]
+
+progname=`basename $0`
+if [ $# -lt 2 ] ; then
+ echo "Usage: $progname output_file [compiler_options ...]"
+ exit 1
+fi
+
+outfile=$1
+shift
+
+cat > $outfile <<EOT
+/*
+ * DO NOT EDIT THIS FILE! It was created automatically by $progname.
+ */
+
+char *vpCompilerOptions = "$@";
+EOT
diff -ubrN volpack-1.0b3.orig/makeopts.c volpack-1.0b3/makeopts.c
--- volpack-1.0b3.orig/makeopts.c 1994-12-31 00:53:20.000000000 +0100
+++ volpack-1.0b3/makeopts.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,67 +0,0 @@
-/*
- * makeopts.c
- *
- * Create a C source file containing an initialized string with the
- * compiler options used to compile VolPack.
- *
- * Copyright (c) 1994 The Board of Trustees of The Leland Stanford
- * Junior University. All rights reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation for any purpose is hereby granted without fee, provided
- * that the above copyright notice and this permission notice appear in
- * all copies of this software and that you do not sell the software.
- * Commercial licensing is available by contacting the author.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Author:
- * Phil Lacroute
- * Computer Systems Laboratory
- * Electrical Engineering Dept.
- * Stanford University
- */
-
-/*
- * $Date: 1994/12/30 23:52:38 $
- * $Revision: 1.7 $
- */
-
-#include <stdio.h>
-
-/*
- * Usage: makeopts output_file [compiler_options ...]
- */
-
-main(argc, argv)
-int argc;
-char **argv;
-{
- FILE *fp;
- int c;
-
- if (argc < 2) {
- fprintf(stderr, "Usage: %s output_file [compiler_options ...]\n",
- argv[0]);
- exit(1);
- }
- if ((fp = fopen(argv[1], "w")) == NULL) {
- fprintf(stderr, "%s: could not open %s\n", argv[0], argv[1]);
- exit(1);
- }
- fprintf(fp, "/*\n");
- fprintf(fp,
- " * DO NOT EDIT THIS FILE! It was created automatically by %s.\n",
- argv[0]);
- fprintf(fp, " */\n\n");
- fprintf(fp, "char *vpCompilerOptions = \"");
- for (c = 2; c < argc; c++) {
- if (c > 2)
- fprintf(fp, " ");
- fprintf(fp, "%s", argv[c]);
- }
- fprintf(fp, "\";\n");
- exit(0);
-}
diff -ubrN volpack-1.0b3.orig/man/Makefile.am volpack-1.0b3/man/Makefile.am
--- volpack-1.0b3.orig/man/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ volpack-1.0b3/man/Makefile.am 2007-07-21 13:20:58.000000000 +0200
@@ -0,0 +1,6 @@
+## Process this file with automake to produce Makefile.in
+# man/Makefile.am for volpack
+# Andreas Tille <tille@debian.org>
+# GPL
+
+SUBDIRS = src
diff -ubrN volpack-1.0b3.orig/man/src/Makefile.am volpack-1.0b3/man/src/Makefile.am
--- volpack-1.0b3.orig/man/src/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ volpack-1.0b3/man/src/Makefile.am 2007-07-28 23:19:03.000000000 +0200
@@ -0,0 +1,19 @@
+## Process this file with automake to produce Makefile.in
+# man/src/Makefile.am for volpack
+# Andreas Tille <tille@debian.org>
+# GPL
+
+dist_man_MANS = \
+ BruteForce.3 Callback.3 ClientData.3 ClsfyScalar.3 ClsfyScan.3 \
+ ClsfyTable.3 ClsfyVolume.3 Context.3 CurrentMatrix.3 Debug.3 \
+ DepthCueing.3 Enable.3 Error.3 Extract.3 Filter.3 FilterTab.3 \
+ Get.3 GetImage.3 GetLight.3 GetMaterial.3 GetMatrix.3 Identity.3 \
+ Image.3 Light.3 LinAlgebra.3 Load.3 LookupShader.3 Material.3 \
+ MinMaxOctree.3 MultMatrix.3 NormalIndex.3 OctreeMask.3 Ramp.3 \
+ RawVoxels.3 Render.3 Resample.3 Rotate.3 Scale.3 ScanNormals.3 \
+ Set.3 SetMatrix.3 ShadeTable.3 Shadow.3 Store.3 Timer.3 \
+ TracePixel.3 Translate.3 Transpose.3 VolPack.3 VolumeNormals.3 \
+ VolumeSize.3 VoxelField.3 VoxelSize.3 Window.3 WindowPHIGS.3
+
+EXTRA_DIST = makelinks
+
diff -ubrN volpack-1.0b3.orig/NEWS volpack-1.0b3/NEWS
--- volpack-1.0b3.orig/NEWS 1970-01-01 01:00:00.000000000 +0100
+++ volpack-1.0b3/NEWS 2007-07-28 21:36:22.000000000 +0200
@@ -0,0 +1,4 @@
+For more detailed information please look at the ChangeLog file
+
+2007-07-28
+ - Added automake stuff
|