Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch infinite-plane Excluding Merge-Ins
This is equivalent to a diff from 7f6910b5a1 to 518fed782b
|
2012-05-31
| ||
| 17:51 | Branch "infinite-plane" completed, merged back to main. This is now version 0.2, although some more development may happen before its tagged and bagged. check-in: eec1625aca user: andreask tags: trunk | |
| 17:47 | Undone the parts of [36a89e6461] changing the buffer API. Going back to int's, adapting all users for the same, and putting a compile-time-assert in place to check that its sizeof(int) is good enough (>= 4). Which should be true on most machines this will get compiled on. Small embedded system where this is most likely violated (i.e. int == short) are not a target for crimp anyway. Closed-Leaf check-in: 518fed782b user: andreask tags: infinite-plane | |
|
2012-05-30
| ||
| 23:07 | Casts added and tweaks made to reduce number of warnings. check-in: 36a89e6461 user: andreask tags: infinite-plane | |
| 21:52 | Merged trunk to infinite-plane, brought the changes into line with new macros and structure. Added missing binary operators. check-in: 529bbc9938 user: andreask tags: infinite-plane | |
|
2012-05-23
| ||
| 18:12 | Updated install guide to include the crimp's tcllib/tklib dependencies. Regenerated embedded documentation. check-in: 7f6910b5a1 user: andreask tags: trunk | |
|
2012-03-22
| ||
| 17:29 | Extended the set of scale operators to the greyN types, and exposed them through a new public method (crimp scale). Updated documentation. Regenerated embedded documentation. Tweaked the output generated by critcl a bit (feedback while reading .crimp files). check-in: 89cea61f4a user: andreask tags: trunk | |
Changes to c/buffer.c.
| ︙ | |||
92 93 94 95 96 97 98 | 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 | - + |
{
if (n < 0) {
n = strlen (str);
}
CRIMP_ASSERT_BOUNDS (n,(buf->sentinel - buf->here));
|
| ︙ |
Changes to c/buffer.h.
| ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | + + + + + + + + + |
unsigned char* buf; /* Start of data */
unsigned char* here; /* Current byte, read location */
unsigned char* sentinel; /* End of buffer, behind last byte */
int length; /* Size of buffer, sentinel - buf */
} crimp_buffer;
#define crimp_buf_at(b) ((b)->here)
/*
* BUILD ASSERTION: The buffer API assumes that a variable of type 'int' can
* hold (at least) 4 bytes (See the crimp_read_*int32* functions). Failure in
* the line below tells us that this is not true for the chosen combination of
* OS, compiler, and compiler flags.
*/
CRIMP_BUILD_ASSERT (sizeof(int) >= 4);
/*
* Local Variables:
* mode: c
* c-basic-offset: 4
* fill-column: 78
* End:
|
| ︙ |
Changes to c/common.h.
1 2 3 4 | 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 | - + + + + + + + + + + + + + + + | #ifndef CRIMP_COMMON_H #define CRIMP_COMMON_H /* * CRIMP :: Common Declarations :: PUBLIC |
| ︙ |
Changes to c/gauss.c.
| ︙ | |||
283 284 285 286 287 288 289 | 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 | - + |
switch(filterPtr->type) {
case GFT_FIR:
FIRDestroyFilterSet(&filterPtr->filters.fir);
break;
default:
break;
}
|
| ︙ | |||
387 388 389 390 391 392 393 | 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 | - + - + |
int width, /* Width of the images */
float* inputImage, /* Input image: (height x width) array of
* float's, row-major order */
float* outputImage /* Output image: (height x width) array of
* float's, row-major order */
) {
int area = height * width;
|
| ︙ | |||
429 430 431 432 433 434 435 | 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 | - + - + |
int width, /* Width of the images */
float* inputImage, /* Input image: (height x width) array of
* float's, row-major order */
float* outputImage /* Output image: (height x width) array of
* float's, row-major order */
) {
int area = height * width;
|
| ︙ | |||
477 478 479 480 481 482 483 | 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 | - + - + |
int width, /* Width of the images */
float* inputImage, /* Input image: (height x width) array of
* float's, row-major order */
float* outputImage /* Output image: (height x width) array of
* float's, row-major order */
) {
int area = height * width;
|
| ︙ | |||
526 527 528 529 530 531 532 | 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 | - + - + |
float* inputImage, /* Input image: (height x width) array of
* float's, row-major order */
float* outputImage /* Output image: (height x width) array of
* float's, row-major order */
) {
int i;
int area = height * width;
|
| ︙ | |||
565 566 567 568 569 570 571 | 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 | - - + + |
int width, /* Width of the images */
float* inputImage, /* Input image: (height x width) array of
* float's, row-major order */
float* outputImage /* Output image: (height x width) array of
* float's, row-major order */
) {
int area = height * width;
|
| ︙ | |||
592 593 594 595 596 597 598 | 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 | - - + + |
/* Sum the two results */
for (i = 0; i < area; ++i) {
outputImage[i] += tempImage2[i];
}
|
| ︙ | |||
981 982 983 984 985 986 987 | 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 | - - - - + + + + |
for (i = 0; i < 3; ++i) {
filterPtr->coefs[i].n0 /= s[i];
filterPtr->coefs[i].n1 /= s[i];
filterPtr->coefs[i].n2 /= s[i];
filterPtr->coefs[i].n3 /= s[i];
}
|
| ︙ |
Changes to c/geometry.c.
| ︙ | |||
27 28 29 30 31 32 33 | 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 | - - + + - - + + + - - - - - - - - - - + - - + - - + - + - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + + + + |
}
crimp_image*
crimp_geo_warp_init (crimp_image* input, crimp_image* forward, int* origx, int* origy)
{
/*
* Run the four corners of the input through the forward transformation to
|
Changes to c/geometry.h.
| ︙ | |||
12 13 14 15 16 17 18 19 20 21 22 23 24 25 | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | + + + + + | * API :: Core. */ extern void crimp_geo_warp_point (crimp_image* matrix, double* x, double* y); extern crimp_image* crimp_geo_warp_init (crimp_image* input, crimp_image* forward, int* origx, int* origy); extern void crimp_rect_union (const crimp_geometry* a, const crimp_geometry* b, crimp_geometry* result); /* * Local Variables: * mode: c * c-basic-offset: 4 * fill-column: 78 * End: |
| ︙ |
Changes to c/image.c.
| ︙ | |||
29 30 31 32 33 34 35 | 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 | - + + - - + + + + + + - + + - - + + + + + + | }; /* * Definitions :: Core. */ crimp_image* |
| ︙ | |||
164 165 166 167 168 169 170 | 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 | - + - + |
/* image type */
Tcl_DStringAppendElement (&ds, ci->itype->name);
/* image width */
{
char wstring [20];
|
| ︙ |
Changes to c/image.h.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | 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 | + + + + + + + + + + + - + - - + - - - - + + + + - - - - + + + + - + - - - + + + - - + + - + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + - + + + + + + + + + - + - + - + - + - + |
#ifndef CRIMP_IMAGE_H
#define CRIMP_IMAGE_H
/*
* CRIMP :: Image Declarations, and API :: PUBLIC
* (C) 2010 - 2011
*/
#include "common.h"
#include "image_type.h"
/*
* Structures describing images.
*
* - A convenient name for a memory block of pixel data
* - The geometry (bounding box) of an image.
* - The image itself.
*/
typedef unsigned char* crimp_pixel_array;
typedef struct crimp_geometry {
int x; /* Location of the image in the infinite 2D plane */
int y; /* s.a. */
int w; /* Image dimension, width */
int h; /* Image dimension, height */
} crimp_geometry;
typedef struct crimp_image {
Tcl_Obj* meta; /* Tcl level client data */
const crimp_imagetype* itype; /* Reference to type descriptor */
|
Changes to c/labelcc.c.
| ︙ | |||
160 161 162 163 164 165 166 | 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 | - - + + + + - + |
const void* bgValue,
/* Pointer to the pixel value that will be
* used as background. All background pixels
* are coalesced into a single component.
* NULL means not to use a background value. */
crimp_image* imagePtr /* Input image to segment. */
) {
|
| ︙ |
Changes to c/linearalgebra.c.
| ︙ | |||
58 59 60 61 62 63 64 | 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 | - + - - + + + + + - + - - + + - + |
return result;
}
crimp_image*
crimp_la_multiply_matrix (crimp_image* a, crimp_image* b)
{
crimp_image* result;
|
| ︙ |
Changes to c/volume.c.
| ︙ | |||
29 30 31 32 33 34 35 | 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 | - + + - - - + + + + + + + + - + + - - - + + + + + + + + | }; /* * Definitions :: Core. */ crimp_volume* |
| ︙ | |||
166 167 168 169 170 171 172 | 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 | - + - + - + |
/* volume type */
Tcl_DStringAppendElement (&ds, cv->itype->name);
/* volume width */
{
char wstring [20];
|
| ︙ |
Changes to c/volume.h.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | 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 | + + + + + + + + + + + + - + - - - - + + + + + + - - + + - + + + + + + + + + + + + + + + + |
#ifndef CRIMP_VOLUME_H
#define CRIMP_VOLUME_H
/*
* CRIMP :: Volume Declarations, and API :: PUBLIC
* (C) 2010 - 2011
*/
#include "common.h"
#include "image_type.h"
/*
* Structures describing volumes.
*
* - The geometry (bounding box) of a volume.
* - The volume itself.
*/
typedef struct crimp_geometry3d {
int x; /* Location of the volume in the infinite 3D volume */
int y; /* s.a. */
int z; /* s.a. */
int w; /* Volume dimension, width */
int h; /* Volume dimension, height */
int d; /* Volume dimension, depth */
} crimp_geometry3d;
typedef struct crimp_volume {
Tcl_Obj* meta; /* Tcl level client data */
const crimp_imagetype* itype; /* Reference to type descriptor */
|
| ︙ |
Deleted cop/binop_float_float.c.
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Added cop/binop_float_float_float.c.
|
Added cop/binop_float_fpcomplex_fpcomplex.c.
|
Deleted cop/binop_float_grey16.c.
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Added cop/binop_float_grey16_float.c.
|
Deleted cop/binop_float_grey32.c.
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Added cop/binop_float_grey32_float.c.
|
Deleted cop/binop_float_grey8.c.
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Added cop/binop_float_grey8_float.c.
|
Added cop/binop_fpcomplex_float_fpcomplex.c.
|
Deleted cop/binop_fpcomplex_fpcomplex.c.
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|
Added cop/binop_fpcomplex_fpcomplex_fpcomplex.c.
|