Fix build warning like "warning: ISO C90 forbids mixed declarations and code" after adjust the location for malloc fail check.
Unified · Split
| @@ -33,6 +33,9 @@ static void display_integral(const uint32_t *ii, int w, int h, int lz_32) · 32 unmodified lines | |||
| 33 | int main(void) | 33 | int main(void) |
| 34 | { | 34 | { |
| 35 | int ret = 0, xoff, yoff; | 35 | int ret = 0, xoff, yoff; |
| 36 | uint32_t *ii_start; | ||
| 37 | uint32_t *ii_start2; | ||
| 38 | NLMeansDSPContext dsp = {0}; | ||
| 36 | 39 | ||
| 37 | // arbitrary test source of size 6x4 and linesize=8 | 40 | // arbitrary test source of size 6x4 and linesize=8 |
| 38 | const int w = 6, h = 5, lz = 8; | 41 | const int w = 6, h = 5, lz = 8; |
| @@ -57,10 +60,8 @@ int main(void) · 18 unmodified lines | |||
| 57 | if (!ii || !ii2) | 60 | if (!ii || !ii2) |
| 58 | return -1; | 61 | return -1; |
| 59 | 62 | ||
| 60 | uint32_t *ii_start = ii + ii_lz_32 + 1; // skip top 0-line and left 0-column | 63 | ii_start = ii + ii_lz_32 + 1; // skip top 0-line and left 0-column |
| 61 | uint32_t *ii_start2 = ii2 + ii_lz_32 + 1; // skip top 0-line and left 0-column | 64 | ii_start2 = ii2 + ii_lz_32 + 1; // skip top 0-line and left 0-column |
| 62 | |||
| 63 | NLMeansDSPContext dsp = {0}; | ||
| 64 | 65 | ||
| 65 | ff_nlmeans_init(&dsp); | 66 | ff_nlmeans_init(&dsp); |
| 66 | 67 | ||