From f3c9d85c7300de9497e8c4d801940ce5c63ecfe5 Mon Sep 17 00:00:00 2001 From: tth Date: Sun, 28 Mar 2021 19:33:02 +0200 Subject: [PATCH] oups... --- experiment/assemblage.c | 3 ++- experiment/incrustator.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/experiment/assemblage.c b/experiment/assemblage.c index 8133361..368df04 100644 --- a/experiment/assemblage.c +++ b/experiment/assemblage.c @@ -29,7 +29,8 @@ if (foo) { fprintf(stderr, "%s: Kkrkr %d pour create incrust\n", __func__, foo); return -1; } -fimg_drand48(&incrust, 13.37); +// fimg_drand48(&incrust, 13.37); +foo = fimg_load_from_dump("foo.fimg", &incrust); foo = incrustator_0(&incrust, &grande, 100, 100, 0); if (foo) { diff --git a/experiment/incrustator.c b/experiment/incrustator.c index 94c37c7..6f6f076 100644 --- a/experiment/incrustator.c +++ b/experiment/incrustator.c @@ -38,13 +38,13 @@ if ( (xpos < 0) || (xpos > pdst->width - psrc->width) || srcpos = 0; szl = psrc->width * sizeof(float); for (y=0; yheight; y++) { - dstpos = ((y +ypos) * pdst->width) + xpos; + dstpos = ((y + ypos) * pdst->width) + xpos; // fprintf(stderr, " %7d %7d %7d\n", y, srcpos, dstpos); memcpy(pdst->R + dstpos, psrc->R + srcpos, szl); memcpy(pdst->G + dstpos, psrc->G + srcpos, szl); memcpy(pdst->B + dstpos, psrc->B + srcpos, szl); - srcpos += psrc->height; + srcpos += psrc->width; } return 0;