projects
/
flatland.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4aed0ce
)
Cosmetics.
author
Francois Fleuret
<francois@fleuret.org>
Wed, 1 Mar 2017 19:39:48 +0000
(20:39 +0100)
committer
Francois Fleuret
<francois@fleuret.org>
Wed, 1 Mar 2017 19:39:48 +0000
(20:39 +0100)
flatland.c
patch
|
blob
|
history
diff --git
a/flatland.c
b/flatland.c
index
71dee63
..
032336a
100644
(file)
--- a/
flatland.c
+++ b/
flatland.c
@@
-29,9
+29,7
@@
THByteTensor *generate_sequence(long nb_sequences, long nb_images_per_sequence,
size->data[2] = nb_channels;
size->data[3] = image_height;
size->data[4] = image_width;
size->data[2] = nb_channels;
size->data[3] = image_height;
size->data[4] = image_width;
-
THByteTensor *result = THByteTensor_newWithSize(size, NULL);
THByteTensor *result = THByteTensor_newWithSize(size, NULL);
-
THLongStorage_free(size);
st0 = THByteTensor_stride(result, 0);
THLongStorage_free(size);
st0 = THByteTensor_stride(result, 0);
@@
-43,17
+41,13
@@
THByteTensor *generate_sequence(long nb_sequences, long nb_images_per_sequence,
unsigned char tmp_buffer[nb_images_per_sequence * nb_channels * image_width * image_height];
for(s = 0; s < nb_sequences; s++) {
unsigned char tmp_buffer[nb_images_per_sequence * nb_channels * image_width * image_height];
for(s = 0; s < nb_sequences; s++) {
- a =
- THByteTensor_storage(result)->data + THByteTensor_storageOffset(result) + s * st0;
-
+ a = THByteTensor_storage(result)->data + THByteTensor_storageOffset(result) + s * st0;
fl_generate_sequences(1, nb_images_per_sequence, image_width, image_height, tmp_buffer);
fl_generate_sequences(1, nb_images_per_sequence, image_width, image_height, tmp_buffer);
-
unsigned char *r = tmp_buffer;
for(k = 0; k < nb_images_per_sequence; k++) {
for(c = 0; c < nb_channels; c++) {
for(i = 0; i < image_height; i++) {
unsigned char *r = tmp_buffer;
for(k = 0; k < nb_images_per_sequence; k++) {
for(c = 0; c < nb_channels; c++) {
for(i = 0; i < image_height; i++) {
- b = a
- + k * st1 + c * st2 + i * st3;
+ b = a + k * st1 + c * st2 + i * st3;
for(j = 0; j < image_width; j++) {
*b = (unsigned char) (*r);
r++;
for(j = 0; j < image_width; j++) {
*b = (unsigned char) (*r);
r++;