/usr/include/dcmtk/dcmimgle/discalet.h is in libdcmtk2-dev 3.6.0-15+deb8u1.
This file is owned by root:root, with mode 0o644.
The actual contents of the file can be viewed below.
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 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 | /*
*
* Copyright (C) 1996-2011, OFFIS e.V.
* All rights reserved. See COPYRIGHT file for details.
*
* This software and supporting documentation were developed by
*
* OFFIS e.V.
* R&D Division Health
* Escherweg 2
* D-26121 Oldenburg, Germany
*
*
* Module: dcmimgle
*
* Author: Joerg Riesmeier
*
* Purpose: DicomScaleTemplates (Header)
*
* Last Update: $Author: joergr $
* Update Date: $Date: 2011-11-17 16:13:16 $
* CVS/RCS Revision: $Revision: 1.36 $
* Status: $State: Exp $
*
* CVS/RCS Log at end of file
*
*/
#ifndef DISCALET_H
#define DISCALET_H
#include "dcmtk/config/osconfig.h"
#include "dcmtk/ofstd/ofcast.h"
#include "dcmtk/dcmimgle/ditranst.h"
#include "dcmtk/dcmimgle/dipxrept.h"
/*---------------------*
* macro definitions *
*---------------------*/
#define SCALE_FACTOR 4096
#define HALFSCALE_FACTOR 2048
/*--------------------*
* helper functions *
*--------------------*/
// help function to set scaling values
static inline void setScaleValues(Uint16 data[],
const Uint16 min,
const Uint16 max)
{
register Uint16 remainder = max % min;
Uint16 step0 = max / min;
Uint16 step1 = max / min;
if (remainder > OFstatic_cast(Uint16, min / 2))
{
remainder = min - remainder;
++step0;
} else
++step1;
const double count = OFstatic_cast(double, min) / (OFstatic_cast(double, remainder) + 1);
register Uint16 i;
register double c = count;
for (i = 0; i < min; ++i)
{
if ((i >= OFstatic_cast(Uint16, c)) && (remainder > 0))
{
--remainder;
c += count;
data[i] = step1;
}
else
data[i] = step0;
}
}
// cubic value interpolation using Catmull-Rom formula.
// the interpolated pixel lies between the second and the third original pixels
static inline double cubicValue(const double v1,
const double v2,
const double v3,
const double v4,
const double dD,
const double minVal,
const double maxVal)
{
double dVal = 0.5 * ((((-v1 + 3 * v2 - 3 * v3 + v4) * dD + (2 * v1 - 5 * v2 + 4 * v3 - v4)) * dD + (-v1 + v3)) * dD + (v2 + v2));
return (dVal < minVal) ? minVal : ((dVal > maxVal) ? maxVal : dVal);
}
/*---------------------*
* class declaration *
*---------------------*/
/** Template class to scale images (on pixel data level).
* with and without interpolation
*/
template<class T>
class DiScaleTemplate
: public DiTransTemplate<T>
{
public:
/** constructor, scale clipping area.
*
** @param planes number of planes (1 or 3)
* @param columns width of source image
* @param rows height of source image
* @param left_pos left coordinate of clipping area
* @param top_pos top coordinate of clipping area
* @param src_cols width of clipping area
* @param src_rows height of clipping area
* @param dest_cols width of destination image (scaled image)
* @param dest_rows height of destination image
* @param frames number of frames
* @param bits number of bits per plane/pixel
*/
DiScaleTemplate(const int planes,
const Uint16 columns, /* resolution of source image */
const Uint16 rows,
const signed long left_pos, /* origin of clipping area */
const signed long top_pos,
const Uint16 src_cols, /* extension of clipping area */
const Uint16 src_rows,
const Uint16 dest_cols, /* extension of destination image */
const Uint16 dest_rows,
const Uint32 frames, /* number of frames */
const int bits = 0)
: DiTransTemplate<T>(planes, src_cols, src_rows, dest_cols, dest_rows, frames, bits),
Left(left_pos),
Top(top_pos),
Columns(columns),
Rows(rows)
{
}
/** constructor, scale whole image.
*
** @param planes number of planes (1 or 3)
* @param src_cols width of source image
* @param src_rows height of source image
* @param dest_cols width of destination image (scaled image)
* @param dest_rows height of destination image
* @param frames number of frames
* @param bits number of bits per plane/pixel
*/
DiScaleTemplate(const int planes,
const Uint16 src_cols, /* resolution of source image */
const Uint16 src_rows,
const Uint16 dest_cols, /* resolution of destination image */
const Uint16 dest_rows,
const Uint32 frames, /* number of frames */
const int bits = 0)
: DiTransTemplate<T>(planes, src_cols, src_rows, dest_cols, dest_rows, frames, bits),
Left(0),
Top(0),
Columns(src_cols),
Rows(src_rows)
{
}
/** destructor
*/
virtual ~DiScaleTemplate()
{
}
/** check whether template type T is signed or not
*
** @return true if signed, false otherwise
*/
inline int isSigned() const
{
const DiPixelRepresentationTemplate<T> rep;
return rep.isSigned();
}
/** choose scaling/clipping algorithm depending on specified parameters.
*
** @param src array of pointers to source image pixels
* @param dest array of pointers to destination image pixels
* @param interpolate preferred interpolation algorithm (0 = no interpolation, 1 = pbmplus algorithm,
* 2 = c't algorithm, 3 = bilinear magnification, 4 = bicubic magnification)
* @param value value to be set outside the image boundaries (used for clipping, default: 0)
*/
void scaleData(const T *src[],
T *dest[],
const int interpolate,
const T value = 0)
{
if ((src != NULL) && (dest != NULL))
{
DCMIMGLE_TRACE("Col/Rows: " << Columns << " " << Rows << OFendl
<< "Left/Top: " << Left << " " << Top << OFendl
<< "Src X/Y: " << this->Src_X << " " << this->Src_Y << OFendl
<< "Dest X/Y: " << this->Dest_X << " " << this->Dest_Y);
if ((Left + OFstatic_cast(signed long, this->Src_X) <= 0) || (Top + OFstatic_cast(signed long, this->Src_Y) <= 0) ||
(Left >= OFstatic_cast(signed long, Columns)) || (Top >= OFstatic_cast(signed long, Rows)))
{ // no image to be displayed
DCMIMGLE_DEBUG("clipping area is fully outside the image boundaries");
this->fillPixel(dest, value); // ... fill bitmap
}
else if ((this->Src_X == this->Dest_X) && (this->Src_Y == this->Dest_Y)) // no scaling
{
if ((Left == 0) && (Top == 0) && (Columns == this->Src_X) && (Rows == this->Src_Y))
this->copyPixel(src, dest); // copying
else if ((Left >= 0) && (OFstatic_cast(Uint16, Left + this->Src_X) <= Columns) &&
(Top >= 0) && (OFstatic_cast(Uint16, Top + this->Src_Y) <= Rows))
clipPixel(src, dest); // clipping
else
clipBorderPixel(src, dest, value); // clipping (with border)
}
else if ((interpolate == 1) && (this->Bits <= MAX_INTERPOLATION_BITS))
interpolatePixel(src, dest); // interpolation (pbmplus)
else if ((interpolate == 4) && (this->Dest_X >= this->Src_X) && (this->Dest_Y >= this->Src_Y) &&
(this->Src_X >= 3) && (this->Src_Y >= 3))
bicubicPixel(src, dest); // bicubic magnification
else if ((interpolate >= 3) && (this->Dest_X >= this->Src_X) && (this->Dest_Y >= this->Src_Y) &&
(this->Src_X >= 2) && (this->Src_Y >= 2))
bilinearPixel(src, dest); // bilinear magnification
else if ((interpolate >= 1) && (this->Dest_X >= this->Src_X) && (this->Dest_Y >= this->Src_Y))
expandPixel(src, dest); // interpolated expansion (c't)
else if ((interpolate >= 1) && (this->Src_X >= this->Dest_X) && (this->Src_Y >= this->Dest_Y))
reducePixel(src, dest); // interpolated reduction (c't)
else if ((interpolate >= 1) && (this->Bits <= MAX_INTERPOLATION_BITS))
interpolatePixel(src, dest); // interpolation (pbmplus), fallback
else if ((this->Dest_X % this->Src_X == 0) && (this->Dest_Y % this->Src_Y == 0))
replicatePixel(src, dest); // replication
else if ((this->Src_X % this->Dest_X == 0) && (this->Src_Y % this->Dest_Y == 0))
suppressPixel(src, dest); // supression
else
scalePixel(src, dest); // general scaling
}
}
protected:
/// left coordinate of clipping area
const signed long Left;
/// top coordinate of clipping area
const signed long Top;
/// width of source image
const Uint16 Columns;
/// height of source image
const Uint16 Rows;
private:
/** clip image to specified area (only inside image boundaries).
* This is an optimization of the more general method clipBorderPixel().
*
** @param src array of pointers to source image pixels
* @param dest array of pointers to destination image pixels
*/
void clipPixel(const T *src[],
T *dest[])
{
DCMIMGLE_DEBUG("using clip image to specified area algorithm");
const unsigned long x_feed = Columns - this->Src_X;
const unsigned long y_feed = OFstatic_cast(unsigned long, Rows - this->Src_Y) * OFstatic_cast(unsigned long, Columns);
register Uint16 x;
register Uint16 y;
register const T *p;
register T *q;
for (int j = 0; j < this->Planes; ++j)
{
p = src[j] + OFstatic_cast(unsigned long, Top) * OFstatic_cast(unsigned long, Columns) + Left;
q = dest[j];
for (unsigned long f = this->Frames; f != 0; --f)
{
for (y = this->Dest_Y; y != 0; --y)
{
for (x = this->Dest_X; x != 0; --x)
*(q++) = *(p++);
p += x_feed;
}
p += y_feed;
}
}
}
/** clip image to specified area and add a border if necessary
*
** @param src array of pointers to source image pixels
* @param dest array of pointers to destination image pixels
* @param value value to be set outside the image boundaries
*/
void clipBorderPixel(const T *src[],
T *dest[],
const T value)
{
DCMIMGLE_DEBUG("using clip image to specified area and add border algorithm");
const Uint16 s_left = (Left > 0) ? OFstatic_cast(Uint16, Left) : 0;
const Uint16 s_top = (Top > 0) ? OFstatic_cast(Uint16, Top) : 0;
const Uint16 d_left = (Left < 0 ? OFstatic_cast(Uint16, -Left) : 0);
const Uint16 d_top = (Top < 0) ? OFstatic_cast(Uint16, -Top) : 0;
const Uint16 d_right = (OFstatic_cast(unsigned long, this->Src_X) + OFstatic_cast(unsigned long, s_left) <
OFstatic_cast(unsigned long, Columns) + OFstatic_cast(unsigned long, d_left)) ?
(this->Src_X - 1) : (Columns + d_left - s_left - 1);
const Uint16 d_bottom = (OFstatic_cast(unsigned long, this->Src_Y) + OFstatic_cast(unsigned long, s_top) <
OFstatic_cast(unsigned long, Rows) + OFstatic_cast(unsigned long, d_top)) ?
(this->Src_Y - 1) : (Rows + d_top - s_top - 1);
const Uint16 x_count = d_right - d_left + 1;
const Uint16 y_count = d_bottom - d_top + 1;
const unsigned long s_start = OFstatic_cast(unsigned long, s_top) * OFstatic_cast(unsigned long, Columns) + s_left;
const unsigned long x_feed = Columns - x_count;
const unsigned long y_feed = OFstatic_cast(unsigned long, Rows - y_count) * Columns;
const unsigned long t_feed = OFstatic_cast(unsigned long, d_top) * OFstatic_cast(unsigned long, this->Src_X);
const unsigned long b_feed = OFstatic_cast(unsigned long, this->Src_Y - d_bottom - 1) * OFstatic_cast(unsigned long, this->Src_X);
/*
* The approach is to divide the destination image in up to four areas outside the source image
* plus one area for the source image. The for and while loops are scanning linearly over the
* destination image and setting the appropriate value depending on the current area. This is
* different from most of the other algorithms in this toolkit where the source image is scanned
* linearly.
*/
register Uint16 x;
register Uint16 y;
register unsigned long i;
register const T *p;
register T *q;
for (int j = 0; j < this->Planes; ++j)
{
p = src[j] + s_start;
q = dest[j];
for (unsigned long f = this->Frames; f != 0; --f)
{
for (i = t_feed; i != 0; --i) // top
*(q++) = value;
for (y = y_count; y != 0; --y) // middle part:
{
x = 0;
while (x < d_left) // - left
{
*(q++) = value;
++x;
}
while (x <= d_right) // - middle
{
*(q++) = *(p++);
++x;
}
while (x < this->Src_X) // - right
{
*(q++) = value;
++x;
}
p += x_feed;
}
for (i = b_feed; i != 0; --i) // bottom
*(q++) = value;
p += y_feed;
}
}
}
/** enlarge image by an integer factor.
* Pixels are replicated independently in both directions.
*
** @param src array of pointers to source image pixels
* @param dest array of pointers to destination image pixels
*/
void replicatePixel(const T *src[],
T *dest[])
{
DCMIMGLE_DEBUG("using replicate pixel scaling algorithm without interpolation");
const Uint16 x_factor = this->Dest_X / this->Src_X;
const Uint16 y_factor = this->Dest_Y / this->Src_Y;
const unsigned long x_feed = Columns;
const unsigned long y_feed = OFstatic_cast(unsigned long, Rows - this->Src_Y) * OFstatic_cast(unsigned long, Columns);
const T *sp;
register Uint16 x;
register Uint16 y;
register Uint16 dx;
register Uint16 dy;
register const T *p;
register T *q;
register T value;
for (int j = 0; j < this->Planes; ++j)
{
sp = src[j] + OFstatic_cast(unsigned long, Top) * OFstatic_cast(unsigned long, Columns) + Left;
q = dest[j];
for (unsigned long f = this->Frames; f != 0; --f)
{
for (y = this->Src_Y; y != 0; --y)
{
for (dy = y_factor; dy != 0; --dy)
{
for (x = this->Src_X, p = sp; x != 0; --x)
{
value = *(p++);
for (dx = x_factor; dx != 0; --dx)
*(q++) = value;
}
}
sp += x_feed;
}
sp += y_feed;
}
}
}
/** shrink image by an integer divisor.
* Pixels are suppressed independently in both directions.
*
** @param src array of pointers to source image pixels
* @param dest array of pointers to destination image pixels
*/
void suppressPixel(const T *src[],
T *dest[])
{
DCMIMGLE_DEBUG("using suppress pixel scaling algorithm without interpolation");
const unsigned int x_divisor = this->Src_X / this->Dest_X;
const unsigned long x_feed = OFstatic_cast(unsigned long, this->Src_Y / this->Dest_Y) * OFstatic_cast(unsigned long, Columns) - this->Src_X;
const unsigned long y_feed = OFstatic_cast(unsigned long, Rows - this->Src_Y) * OFstatic_cast(unsigned long, Columns);
register Uint16 x;
register Uint16 y;
register const T *p;
register T *q;
for (int j = 0; j < this->Planes; ++j)
{
p = src[j] + OFstatic_cast(unsigned long, Top) * OFstatic_cast(unsigned long, Columns) + Left;
q = dest[j];
for (unsigned long f = this->Frames; f != 0; --f)
{
for (y = this->Dest_Y; y != 0; --y)
{
for (x = this->Dest_X; x != 0; --x)
{
*(q++) = *p;
p += x_divisor;
}
p += x_feed;
}
p += y_feed;
}
}
}
/** free scaling method without interpolation.
* This algorithm is necessary for overlays (1 bpp).
*
** @param src array of pointers to source image pixels
* @param dest array of pointers to destination image pixels
*/
void scalePixel(const T *src[],
T *dest[])
{
DCMIMGLE_DEBUG("using free scaling algorithm without interpolation");
const Uint16 xmin = (this->Dest_X < this->Src_X) ? this->Dest_X : this->Src_X; // minimum width
const Uint16 ymin = (this->Dest_Y < this->Src_Y) ? this->Dest_Y : this->Src_Y; // minimum height
Uint16 *x_step = new Uint16[xmin];
Uint16 *y_step = new Uint16[ymin];
Uint16 *x_fact = new Uint16[xmin];
Uint16 *y_fact = new Uint16[ymin];
/*
* Approach: If one pixel line has to be added or removed it is taken from the middle of the image (1/2).
* For two lines it is at 1/3 and 2/3 of the image and so on. It sounds easy but it was a hard job ;-)
*/
if ((x_step != NULL) && (y_step != NULL) && (x_fact != NULL) && (y_fact != NULL))
{
register Uint16 x;
register Uint16 y;
if (this->Dest_X < this->Src_X)
setScaleValues(x_step, this->Dest_X, this->Src_X);
else if (this->Dest_X > this->Src_X)
setScaleValues(x_fact, this->Src_X, this->Dest_X);
if (this->Dest_X <= this->Src_X)
OFBitmanipTemplate<Uint16>::setMem(x_fact, 1, xmin); // initialize with default values
if (this->Dest_X >= this->Src_X)
OFBitmanipTemplate<Uint16>::setMem(x_step, 1, xmin); // initialize with default values
x_step[xmin - 1] += Columns - this->Src_X; // skip to next line
if (this->Dest_Y < this->Src_Y)
setScaleValues(y_step, this->Dest_Y, this->Src_Y);
else if (this->Dest_Y > this->Src_Y)
setScaleValues(y_fact, this->Src_Y, this->Dest_Y);
if (this->Dest_Y <= this->Src_Y)
OFBitmanipTemplate<Uint16>::setMem(y_fact, 1, ymin); // initialize with default values
if (this->Dest_Y >= this->Src_Y)
OFBitmanipTemplate<Uint16>::setMem(y_step, 1, ymin); // initialize with default values
y_step[ymin - 1] += Rows - this->Src_Y; // skip to next frame
const T *sp;
register Uint16 dx;
register Uint16 dy;
register const T *p;
register T *q;
register T value;
for (int j = 0; j < this->Planes; ++j)
{
sp = src[j] + OFstatic_cast(unsigned long, Top) * OFstatic_cast(unsigned long, Columns) + Left;
q = dest[j];
for (unsigned long f = 0; f < this->Frames; ++f)
{
for (y = 0; y < ymin; ++y)
{
for (dy = 0; dy < y_fact[y]; ++dy)
{
for (x = 0, p = sp; x < xmin; ++x)
{
value = *p;
for (dx = 0; dx < x_fact[x]; ++dx)
*(q++) = value;
p += x_step[x];
}
}
sp += OFstatic_cast(unsigned long, y_step[y]) * OFstatic_cast(unsigned long, Columns);
}
}
}
}
delete[] x_step;
delete[] y_step;
delete[] x_fact;
delete[] y_fact;
}
/** free scaling method with interpolation
*
** @param src array of pointers to source image pixels
* @param dest array of pointers to destination image pixels
*/
void interpolatePixel(const T *src[],
T *dest[])
{
DCMIMGLE_DEBUG("using scaling algorithm with interpolation from pbmplus toolkit");
if ((this->Src_X != Columns) || (this->Src_Y != Rows))
{
DCMIMGLE_ERROR("interpolated scaling and clipping at the same time not implemented ... ignoring clipping region");
this->Src_X = Columns; // temporarily removed 'const' for 'Src_X' in class 'DiTransTemplate'
this->Src_Y = Rows; // ... 'Src_Y' ...
}
/*
* based on scaling algorithm from "Extended Portable Bitmap Toolkit" (pbmplus10dec91)
* (adapted to be used with signed pixel representation, inverse images - mono1,
* various bit depths, multi-frame and multi-plane/color images)
*/
register Uint16 x;
register Uint16 y;
register const T *p;
register T *q;
const T *sp = NULL; // initialization avoids compiler warning
const T *fp;
T *sq;
const unsigned long sxscale = OFstatic_cast(unsigned long, (OFstatic_cast(double, this->Dest_X) / OFstatic_cast(double, this->Src_X)) * SCALE_FACTOR);
const unsigned long syscale = OFstatic_cast(unsigned long, (OFstatic_cast(double, this->Dest_Y) / OFstatic_cast(double, this->Src_Y)) * SCALE_FACTOR);
const signed long maxvalue = DicomImageClass::maxval(this->Bits - isSigned());
T *xtemp = new T[this->Src_X];
signed long *xvalue = new signed long[this->Src_X];
if ((xtemp == NULL) || (xvalue == NULL))
{
DCMIMGLE_ERROR("can't allocate temporary buffers for interpolation scaling");
this->clearPixel(dest);
} else {
for (int j = 0; j < this->Planes; ++j)
{
fp = src[j];
sq = dest[j];
for (unsigned long f = this->Frames; f != 0; --f)
{
for (x = 0; x < this->Src_X; ++x)
xvalue[x] = HALFSCALE_FACTOR;
register unsigned long yfill = SCALE_FACTOR;
register unsigned long yleft = syscale;
register int yneed = 1;
int ysrc = 0;
for (y = 0; y < this->Dest_Y; ++y)
{
if (this->Src_Y == this->Dest_Y)
{
sp = fp;
for (x = this->Src_X, p = sp, q = xtemp; x != 0; --x)
*(q++) = *(p++);
fp += this->Src_X;
}
else
{
while (yleft < yfill)
{
if (yneed && (ysrc < OFstatic_cast(int, this->Src_Y)))
{
sp = fp;
fp += this->Src_X;
++ysrc;
}
for (x = 0, p = sp; x < this->Src_X; ++x)
xvalue[x] += yleft * OFstatic_cast(signed long, *(p++));
yfill -= yleft;
yleft = syscale;
yneed = 1;
}
if (yneed && (ysrc < OFstatic_cast(int, this->Src_Y)))
{
sp = fp;
fp += this->Src_X;
++ysrc;
yneed = 0;
}
register signed long v;
for (x = 0, p = sp, q = xtemp; x < this->Src_X; ++x)
{
v = xvalue[x] + yfill * OFstatic_cast(signed long, *(p++));
v /= SCALE_FACTOR;
*(q++) = OFstatic_cast(T, (v > maxvalue) ? maxvalue : v);
xvalue[x] = HALFSCALE_FACTOR;
}
yleft -= yfill;
if (yleft == 0)
{
yleft = syscale;
yneed = 1;
}
yfill = SCALE_FACTOR;
}
if (this->Src_X == this->Dest_X)
{
for (x = this->Dest_X, p = xtemp, q = sq; x != 0; --x)
*(q++) = *(p++);
sq += this->Dest_X;
}
else
{
register signed long v = HALFSCALE_FACTOR;
register unsigned long xfill = SCALE_FACTOR;
register unsigned long xleft;
register int xneed = 0;
q = sq;
for (x = 0, p = xtemp; x < this->Src_X; ++x, ++p)
{
xleft = sxscale;
while (xleft >= xfill)
{
if (xneed)
{
++q;
v = HALFSCALE_FACTOR;
}
v += xfill * OFstatic_cast(signed long, *p);
v /= SCALE_FACTOR;
*q = OFstatic_cast(T, (v > maxvalue) ? maxvalue : v);
xleft -= xfill;
xfill = SCALE_FACTOR;
xneed = 1;
}
if (xleft > 0)
{
if (xneed)
{
++q;
v = HALFSCALE_FACTOR;
xneed = 0;
}
v += xleft * OFstatic_cast(signed long, *p);
xfill -= xleft;
}
}
if (xfill > 0)
v += xfill * OFstatic_cast(signed long, *(--p));
if (!xneed)
{
v /= SCALE_FACTOR;
*q = OFstatic_cast(T, (v > maxvalue) ? maxvalue : v);
}
sq += this->Dest_X;
}
}
}
}
}
delete[] xtemp;
delete[] xvalue;
}
/** free scaling method with interpolation (only for magnification)
*
** @param src array of pointers to source image pixels
* @param dest array of pointers to destination image pixels
*/
void expandPixel(const T *src[],
T *dest[])
{
DCMIMGLE_DEBUG("using expand pixel scaling algorithm with interpolation from c't magazine");
const double x_factor = OFstatic_cast(double, this->Src_X) / OFstatic_cast(double, this->Dest_X);
const double y_factor = OFstatic_cast(double, this->Src_Y) / OFstatic_cast(double, this->Dest_Y);
const unsigned long f_size = OFstatic_cast(unsigned long, Rows) * OFstatic_cast(unsigned long, Columns);
const T *sp;
double bx, ex;
double by, ey;
int bxi, exi;
int byi, eyi;
unsigned long offset;
double value, sum;
double x_part, y_part;
double l_factor, r_factor;
double t_factor, b_factor;
register int xi;
register int yi;
register Uint16 x;
register Uint16 y;
register const T *p;
register T *q;
/*
* based on scaling algorithm from "c't - Magazin fuer Computertechnik" (c't 11/94)
* (adapted to be used with signed pixel representation, inverse images - mono1,
* various bit depths, multi-frame and multi-plane/color images, combined clipping/scaling)
*/
for (int j = 0; j < this->Planes; ++j)
{
sp = src[j] + OFstatic_cast(unsigned long, Top) * OFstatic_cast(unsigned long, Columns) + Left;
q = dest[j];
for (unsigned long f = 0; f < this->Frames; ++f)
{
for (y = 0; y < this->Dest_Y; ++y)
{
by = y_factor * OFstatic_cast(double, y);
ey = y_factor * (OFstatic_cast(double, y) + 1.0);
byi = OFstatic_cast(int, by);
eyi = OFstatic_cast(int, ey);
if (OFstatic_cast(double, eyi) == ey)
--eyi;
y_part = OFstatic_cast(double, eyi) / y_factor;
b_factor = y_part - OFstatic_cast(double, y);
t_factor = (OFstatic_cast(double, y) + 1.0) - y_part;
for (x = 0; x < this->Dest_X; ++x)
{
value = 0;
bx = x_factor * OFstatic_cast(double, x);
ex = x_factor * (OFstatic_cast(double, x) + 1.0);
bxi = OFstatic_cast(int, bx);
exi = OFstatic_cast(int, ex);
if (OFstatic_cast(double, exi) == ex)
--exi;
x_part = OFstatic_cast(double, exi) / x_factor;
l_factor = x_part - OFstatic_cast(double, x);
r_factor = (OFstatic_cast(double, x) + 1.0) - x_part;
offset = OFstatic_cast(unsigned long, byi) * OFstatic_cast(unsigned long, Columns);
for (yi = byi; yi <= eyi; ++yi)
{
p = sp + offset + bxi;
for (xi = bxi; xi <= exi; ++xi)
{
sum = OFstatic_cast(double, *(p++));
if (bxi != exi)
{
if (xi == bxi)
sum *= l_factor;
else
sum *= r_factor;
}
if (byi != eyi)
{
if (yi == byi)
sum *= b_factor;
else
sum *= t_factor;
}
value += sum;
}
offset += Columns;
}
*(q++) = OFstatic_cast(T, value + 0.5);
}
}
sp += f_size;
}
}
}
/** free scaling method with interpolation (only for reduction)
*
** @param src array of pointers to source image pixels
* @param dest array of pointers to destination image pixels
*/
void reducePixel(const T *src[],
T *dest[])
{
DCMIMGLE_DEBUG("using reduce pixel scaling algorithm with interpolation from c't magazine");
const double x_factor = OFstatic_cast(double, this->Src_X) / OFstatic_cast(double, this->Dest_X);
const double y_factor = OFstatic_cast(double, this->Src_Y) / OFstatic_cast(double, this->Dest_Y);
const double xy_factor = x_factor * y_factor;
const unsigned long f_size = OFstatic_cast(unsigned long, Rows) * OFstatic_cast(unsigned long, Columns);
const T *sp;
double bx, ex;
double by, ey;
int bxi, exi;
int byi, eyi;
unsigned long offset;
double value, sum;
double l_factor, r_factor;
double t_factor, b_factor;
register int xi;
register int yi;
register Uint16 x;
register Uint16 y;
register const T *p;
register T *q;
/*
* based on scaling algorithm from "c't - Magazin fuer Computertechnik" (c't 11/94)
* (adapted to be used with signed pixel representation, inverse images - mono1,
* various bit depths, multi-frame and multi-plane/color images, combined clipping/scaling)
*/
for (int j = 0; j < this->Planes; ++j)
{
sp = src[j] + OFstatic_cast(unsigned long, Top) * OFstatic_cast(unsigned long, Columns) + Left;
q = dest[j];
for (unsigned long f = 0; f < this->Frames; ++f)
{
for (y = 0; y < this->Dest_Y; ++y)
{
by = y_factor * OFstatic_cast(double, y);
ey = y_factor * (OFstatic_cast(double, y) + 1.0);
byi = OFstatic_cast(int, by);
eyi = OFstatic_cast(int, ey);
if (OFstatic_cast(double, eyi) == ey)
--eyi;
b_factor = 1 + OFstatic_cast(double, byi) - by;
t_factor = ey - OFstatic_cast(double, eyi);
for (x = 0; x < this->Dest_X; ++x)
{
value = 0;
bx = x_factor * OFstatic_cast(double, x);
ex = x_factor * (OFstatic_cast(double, x) + 1.0);
bxi = OFstatic_cast(int, bx);
exi = OFstatic_cast(int, ex);
if (OFstatic_cast(double, exi) == ex)
--exi;
l_factor = 1 + OFstatic_cast(double, bxi) - bx;
r_factor = ex - OFstatic_cast(double, exi);
offset = OFstatic_cast(unsigned long, byi) * OFstatic_cast(unsigned long, Columns);
for (yi = byi; yi <= eyi; ++yi)
{
p = sp + offset + bxi;
for (xi = bxi; xi <= exi; ++xi)
{
sum = OFstatic_cast(double, *(p++)) / xy_factor;
if (xi == bxi)
sum *= l_factor;
else if (xi == exi)
sum *= r_factor;
if (yi == byi)
sum *= b_factor;
else if (yi == eyi)
sum *= t_factor;
value += sum;
}
offset += Columns;
}
*(q++) = OFstatic_cast(T, value + 0.5);
}
}
sp += f_size;
}
}
}
/** bilinear interpolation method (only for magnification)
*
** @param src array of pointers to source image pixels
* @param dest array of pointers to destination image pixels
*/
void bilinearPixel(const T *src[],
T *dest[])
{
DCMIMGLE_DEBUG("using magnification algorithm with bilinear interpolation contributed by Eduard Stanescu");
const double x_factor = OFstatic_cast(double, this->Src_X) / OFstatic_cast(double, this->Dest_X);
const double y_factor = OFstatic_cast(double, this->Src_Y) / OFstatic_cast(double, this->Dest_Y);
const unsigned long f_size = OFstatic_cast(unsigned long, Rows) * OFstatic_cast(unsigned long, Columns);
const unsigned long l_offset = OFstatic_cast(unsigned long, this->Src_Y - 1) * OFstatic_cast(unsigned long, this->Dest_X);
register Uint16 x;
register Uint16 y;
register T *pD;
register T *pCurrTemp;
register const T *pCurrSrc;
Uint16 nSrcIndex;
double dOff;
T *pT;
const T *pS;
const T *pF;
// buffer used for storing temporarily the interpolated lines
T *pTemp = new T[OFstatic_cast(unsigned long, this->Src_Y) * OFstatic_cast(unsigned long, this->Dest_X)];
if (pTemp == NULL)
{
DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling");
this->clearPixel(dest);
} else {
/*
* based on scaling algorithm contributed by Eduard Stanescu
* (adapted to be used with signed pixel representation, inverse images - mono1,
* various bit depths, multi-frame multi-plane/color images, combined clipping/scaling)
*/
for (int j = 0; j < this->Planes; ++j)
{
pF = src[j] + OFstatic_cast(unsigned long, Top) * OFstatic_cast(unsigned long, Columns) + Left;
pD = dest[j];
for (unsigned long f = this->Frames; f != 0; --f)
{
pT = pCurrTemp = pTemp;
pS = pCurrSrc = pF;
// first, interpolate the columns:
// column 0, just copy the source data column 0
for (y = this->Src_Y; y != 0; --y)
{
*(pCurrTemp) = *(pCurrSrc);
pCurrSrc += Columns;
pCurrTemp += this->Dest_X;
}
pCurrSrc = pS;
nSrcIndex = 0;
// column 1 to column Dest_X - 1
for (x = 1; x < this->Dest_X - 1; ++x)
{
pCurrTemp = ++pT;
dOff = x * x_factor - nSrcIndex;
dOff = (1.0 < dOff) ? 1.0 : dOff;
for (y = 0; y < this->Src_Y; ++y)
{
*(pCurrTemp) = OFstatic_cast(T, *(pCurrSrc) + (*(pCurrSrc + 1) - *(pCurrSrc)) * dOff);
pCurrSrc += Columns;
pCurrTemp += this->Dest_X;
}
// don't go beyond the source data
if ((nSrcIndex < this->Src_X - 2) && (x * x_factor >= nSrcIndex + 1))
{
pS++;
nSrcIndex++;
}
pCurrSrc = pS;
}
pCurrTemp = ++pT;
// last column, just copy the source data column Src_X
for (y = this->Src_Y; y != 0; --y)
{
*(pCurrTemp) = *(pCurrSrc);
pCurrSrc += Columns;
pCurrTemp += this->Dest_X;
}
// now the columns are interpolated in temp buffer, so interpolate the lines
pT = pCurrTemp = pTemp;
// line 0, just copy the temp buffer line 0
for (x = this->Dest_X; x != 0; --x)
*(pD++) = *(pCurrTemp++);
nSrcIndex = 0;
pCurrTemp = pTemp;
for (y = 1; y < this->Dest_Y - 1; ++y)
{
dOff = y * y_factor - nSrcIndex;
dOff = (1.0 < dOff) ? 1.0 : dOff;
for (x = this->Dest_X; x != 0; --x)
{
*(pD++) = OFstatic_cast(T, *(pCurrTemp) + (*(pCurrTemp + this->Dest_X) - *(pCurrTemp)) * dOff);
pCurrTemp++;
}
// don't go beyond the source data
if ((nSrcIndex < this->Src_Y - 2) && (y * y_factor >= nSrcIndex + 1))
{
pT += this->Dest_X;
nSrcIndex++;
}
pCurrTemp = pT;
}
// the last line, just copy the temp buffer line Src_X
pCurrTemp = pTemp + l_offset;
for (x = this->Dest_X; x != 0; --x)
*(pD++) = *(pCurrTemp++);
// skip to next frame
pF += f_size;
}
}
}
delete[] pTemp;
}
/** bicubic interpolation method (only for magnification)
*
** @param src array of pointers to source image pixels
* @param dest array of pointers to destination image pixels
*/
void bicubicPixel(const T *src[],
T *dest[])
{
DCMIMGLE_DEBUG("using magnification algorithm with bicubic interpolation contributed by Eduard Stanescu");
const double minVal = (isSigned()) ? -OFstatic_cast(double, DicomImageClass::maxval(this->Bits - 1, 0)) : 0.0;
const double maxVal = OFstatic_cast(double, DicomImageClass::maxval(this->Bits - isSigned()));
const double x_factor = OFstatic_cast(double, this->Src_X) / OFstatic_cast(double, this->Dest_X);
const double y_factor = OFstatic_cast(double, this->Src_Y) / OFstatic_cast(double, this->Dest_Y);
const Uint16 xDelta = OFstatic_cast(Uint16, 1 / x_factor);
const Uint16 yDelta = OFstatic_cast(Uint16, 1 / y_factor);
const unsigned long f_size = OFstatic_cast(unsigned long, Rows) * OFstatic_cast(unsigned long, Columns);
const unsigned long l_offset = OFstatic_cast(unsigned long, this->Src_Y - 1) * OFstatic_cast(unsigned long, this->Dest_X);
register Uint16 x;
register Uint16 y;
register T *pD;
register T *pCurrTemp;
register const T *pCurrSrc;
Uint16 nSrcIndex;
double dOff;
T *pT;
const T *pS;
const T *pF;
// buffer used for storing temporarily the interpolated lines
T *pTemp = pT = pCurrTemp = new T[OFstatic_cast(unsigned long, this->Src_Y) * OFstatic_cast(unsigned long, this->Dest_X)];
if (pTemp == NULL)
{
DCMIMGLE_ERROR("can't allocate temporary buffer for interpolation scaling");
this->clearPixel(dest);
} else {
/*
* based on scaling algorithm contributed by Eduard Stanescu
* (adapted to be used with signed pixel representation, inverse images - mono1,
* various bit depths, multi-frame multi-plane/color images, combined clipping/scaling)
*/
for (int j = 0; j < this->Planes; ++j)
{
pF = src[j] + OFstatic_cast(unsigned long, Top) * OFstatic_cast(unsigned long, Columns) + Left;
pD = dest[j];
for (unsigned long f = this->Frames; f != 0; --f)
{
pT = pCurrTemp = pTemp;
pS = pCurrSrc = pF;
// first, interpolate the columns:
// column 0, just copy the source data column 0
for (y = this->Src_Y; y != 0; --y)
{
*(pCurrTemp) = *(pCurrSrc);
pCurrSrc += Columns;
pCurrTemp += this->Dest_X;
}
pCurrSrc = pS;
// for the next few columns, linear interpolation
for (x = 1; x < xDelta + 1; ++x)
{
pCurrSrc = pS;
pCurrTemp = ++pT;
dOff = x * x_factor;
dOff = (1.0 < dOff) ? 1.0 : dOff;
for (y = this->Src_Y; y != 0; --y)
{
*(pCurrTemp) = OFstatic_cast(T, *(pCurrSrc) + (*(pCurrSrc + 1) - *(pCurrSrc)) * dOff);
pCurrSrc += Columns;
pCurrTemp += this->Dest_X;
}
}
nSrcIndex = 1;
pCurrSrc = ++pS;
// the majority of the columns
for (x = xDelta + 1; x < this->Dest_X - 2 * xDelta; ++x)
{
pCurrTemp = ++pT;
dOff = x * x_factor - nSrcIndex;
dOff = (1.0 < dOff) ? 1.0 : dOff;
for (y = this->Src_Y; y != 0; --y)
{
*(pCurrTemp) = OFstatic_cast(T, cubicValue(*(pCurrSrc - 1), *(pCurrSrc), *(pCurrSrc + 1), *(pCurrSrc + 2), dOff, minVal, maxVal));
pCurrSrc += Columns;
pCurrTemp += this->Dest_X;
}
// don't go beyond the source data
if ((nSrcIndex < this->Src_X - 3) && (x * x_factor >= nSrcIndex + 1))
{
pS++;
nSrcIndex++;
}
pCurrSrc = pS;
}
// last few columns except the very last one, linear interpolation
for (x = this->Dest_X - 2 * xDelta; x < this->Dest_X - 1; ++x)
{
pCurrTemp = ++pT;
dOff = x * x_factor - nSrcIndex;
dOff = (1.0 < dOff) ? 1.0 : dOff;
for (y = this->Src_Y; y != 0; --y)
{
*(pCurrTemp) = OFstatic_cast(T, *(pCurrSrc) + (*(pCurrSrc + 1) - *(pCurrSrc)) * dOff);
pCurrSrc += Columns;
pCurrTemp += this->Dest_X;
}
// don't go beyond the source data
if ((nSrcIndex < this->Src_X - 2) && (x * x_factor >= nSrcIndex + 1))
{
pS++;
nSrcIndex++;
}
pCurrSrc = pS;
}
// last column, just copy the source data column Src_X
pCurrTemp = pTemp + this->Dest_X - 1;
pCurrSrc = pF + this->Src_X - 1;
for (y = this->Src_Y; y != 0; --y)
{
*(pCurrTemp) = *(pCurrSrc);
pCurrSrc += Columns;
pCurrTemp += this->Dest_X;
}
// now the columns are interpolated in temp buffer, so interpolate the lines
pT = pCurrTemp = pTemp;
// line 0, just copy the temp buffer line 0
for (x = this->Dest_X; x != 0; --x)
*(pD++) = *(pCurrTemp++);
// for the next few lines, linear interpolation between line 0 and 1 of the temp buffer
for (y = 1; y < yDelta + 1; ++y)
{
pCurrTemp = pTemp;
dOff = y * y_factor;
dOff = (1.0 < dOff) ? 1.0 : dOff;
for (x = this->Dest_X; x != 0; --x)
{
*(pD++) = OFstatic_cast(T, *(pCurrTemp) + (*(pCurrTemp + this->Dest_X) - *(pCurrTemp)) * dOff);
pCurrTemp++;
}
}
nSrcIndex = 1;
pCurrTemp = pT = pTemp + this->Dest_X;
for (y = yDelta + 1; y < this->Dest_Y - yDelta - 1; ++y)
{
dOff = y * y_factor - nSrcIndex;
dOff = (1.0 < dOff) ? 1.0 : dOff;
for (x = this->Dest_X; x != 0; --x)
{
*(pD++) = OFstatic_cast(T, cubicValue(*(pCurrTemp - this->Dest_X),*(pCurrTemp), *(pCurrTemp + this->Dest_X),
*(pCurrTemp + this->Dest_X + this->Dest_X), dOff, minVal, maxVal));
pCurrTemp++;
}
// don't go beyond the source data
if ((nSrcIndex < this->Src_Y - 3) && (y * y_factor >= nSrcIndex + 1))
{
pT += this->Dest_X;
nSrcIndex++;
}
pCurrTemp = pT;
}
// the last few lines except the very last one, linear interpolation in between the second last and the last lines
pCurrTemp = pT = pTemp + OFstatic_cast(unsigned long, this->Src_Y - 2) * OFstatic_cast(unsigned long, this->Dest_X);
for (y = this->Dest_Y - yDelta - 1; y < this->Dest_Y - 1; ++y)
{
dOff = y * y_factor - nSrcIndex;
dOff = (1.0 < dOff) ? 1.0 : dOff;
for (x = this->Dest_X; x != 0; --x)
{
*(pD++) = OFstatic_cast(T, *(pCurrTemp) + (*(pCurrTemp + this->Dest_X) - *(pCurrTemp)) * dOff);
pCurrTemp++;
}
pCurrTemp = pT;
}
// the the last line, just copy the temp buffer line Src_X
pCurrTemp = pTemp + l_offset;
for (x = this->Dest_X; x != 0; --x)
*(pD++) = *(pCurrTemp++);
// skip to next frame
pF += f_size;
}
}
}
delete[] pTemp;
}
};
#endif
/*
*
* CVS/RCS Log:
* $Log: discalet.h,v $
* Revision 1.36 2011-11-17 16:13:16 joergr
* Minor fixes to keep XCode 4.2 on Mac OS X Lion (clang compiler) quiet.
*
* Revision 1.35 2010-10-14 13:16:27 joergr
* Updated copyright header. Added reference to COPYRIGHT file.
*
* Revision 1.34 2010-03-01 09:08:47 uli
* Removed some unnecessary include directives in the headers.
*
* Revision 1.33 2009-11-25 15:49:25 joergr
* Removed inclusion of header file "ofconsol.h".
*
* Revision 1.32 2009-10-28 14:38:17 joergr
* Fixed minor issues in log output.
*
* Revision 1.31 2009-10-28 09:53:40 uli
* Switched to logging mechanism provided by the "new" oflog module.
*
* Revision 1.30 2008-05-21 10:12:27 joergr
* Fixed bug in c't scaling algorithm (expandPixel) which could cause a crash
* (possible integer underflow/overflow).
*
* Revision 1.29 2008-05-20 15:26:45 joergr
* Fixed small issue in bicubic image scaling algorithm (in clipping mode).
*
* Revision 1.28 2008-05-20 13:16:38 joergr
* Fixed issue with signed pixel data in bicubic interpolation algorithm.
* Use the pbmplus scaling algorithm as the second best fallback if the c't
* algorithm cannot be used (e.g. up and down-scaling on different axes).
* Replaced macro call by inline function (approx. same performance).
*
* Revision 1.27 2008-05-20 10:37:00 joergr
* Added new bilinear and bicubic scaling algorithms for image magnification.
* Now the c't scaling algorithm is used as a fallback if the preferred
* algorithm with interpolation is not applicable.
* Fixed bug in c't scaling algorithm (reducePixel) which could cause a crash.
*
* Revision 1.26 2006/08/15 16:30:11 meichel
* Updated the code in module dcmimgle to correctly compile when
* all standard C++ classes remain in namespace std.
*
* Revision 1.25 2005/12/08 16:48:09 meichel
* Changed include path schema for all DCMTK header files
*
* Revision 1.24 2004/04/21 10:00:36 meichel
* Minor modifications for compilation with gcc 3.4.0
*
* Revision 1.23 2004/01/05 14:52:20 joergr
* Removed acknowledgements with e-mail addresses from CVS log.
*
* Revision 1.22 2003/12/23 15:53:22 joergr
* Replaced post-increment/decrement operators by pre-increment/decrement
* operators where appropriate (e.g. 'i++' by '++i').
*
* Revision 1.21 2003/12/09 10:25:06 joergr
* Adapted type casts to new-style typecast operators defined in ofcast.h.
* Removed leading underscore characters from preprocessor symbols (reserved
* symbols). Updated copyright header.
*
* Revision 1.20 2002/12/09 13:32:56 joergr
* Renamed parameter/local variable to avoid name clashes with global
* declaration left and/or right (used for as iostream manipulators).
*
* Revision 1.19 2002/04/16 13:53:12 joergr
* Added configurable support for C++ ANSI standard includes (e.g. streams).
*
* Revision 1.18 2001/06/01 15:49:51 meichel
* Updated copyright header
*
* Revision 1.17 2000/05/03 09:46:29 joergr
* Removed most informational and some warning messages from release built
* (#ifndef DEBUG).
*
* Revision 1.16 2000/04/28 12:32:33 joergr
* DebugLevel - global for the module - now derived from OFGlobal (MT-safe).
*
* Revision 1.15 2000/04/27 13:08:42 joergr
* Dcmimgle library code now consistently uses ofConsole for error output.
*
* Revision 1.14 2000/03/08 16:24:24 meichel
* Updated copyright header.
*
* Revision 1.13 2000/03/07 16:15:13 joergr
* Added explicit type casts to make Sun CC 2.0.1 happy.
*
* Revision 1.12 2000/03/03 14:09:14 meichel
* Implemented library support for redirecting error messages into memory
* instead of printing them to stdout/stderr for GUI applications.
*
* Revision 1.11 1999/11/19 12:37:19 joergr
* Fixed bug in scaling method "reducePixel" (reported by gcc 2.7.2.1).
*
* Revision 1.10 1999/09/17 13:07:20 joergr
* Added/changed/completed DOC++ style comments in the header files.
* Enhanced efficiency of some "for" loops.
*
* Revision 1.9 1999/08/25 16:41:55 joergr
* Added new feature: Allow clipping region to be outside the image
* (overlapping).
*
* Revision 1.8 1999/07/23 14:09:24 joergr
* Added new interpolation algorithm for scaling.
*
* Revision 1.7 1999/04/28 14:55:05 joergr
* Introduced new scheme for the debug level variable: now each level can be
* set separately (there is no "include" relationship).
*
* Revision 1.6 1999/03/24 17:20:24 joergr
* Added/Modified comments and formatting.
*
* Revision 1.5 1999/02/11 16:42:10 joergr
* Removed inline declarations from several methods.
*
* Revision 1.4 1999/02/03 17:35:14 joergr
* Moved global functions maxval() and determineRepresentation() to class
* DicomImageClass (as static methods).
*
* Revision 1.3 1998/12/22 14:39:44 joergr
* Added some preparation to enhance interpolated scaling (clipping and
* scaling) in the future.
*
* Revision 1.2 1998/12/16 16:39:45 joergr
* Implemented combined clipping and scaling for pixel replication and
* suppression.
*
* Revision 1.1 1998/11/27 15:47:11 joergr
* Added copyright message.
* Combined clipping and scaling methods.
*
* Revision 1.4 1998/05/11 14:53:29 joergr
* Added CVS/RCS header to each file.
*
*
*/
|