Unified · Split
| @@ -1119,7 +1119,6 @@ static int dwa_uncompress(const EXRContext *s, const uint8_t *src, int compresse · 1118 unmodified lines | |||
| 1119 | } | 1119 | } |
| 1120 | 1120 | ||
| 1121 | { | 1121 | { |
| 1122 | const float scale = s->pixel_type == EXR_FLOAT ? 2.f : 1.f; | ||
| 1123 | const int o = s->nb_channels == 4; | 1122 | const int o = s->nb_channels == 4; |
| 1124 | float *bo = ((float *)td->uncompressed_data) + | 1123 | float *bo = ((float *)td->uncompressed_data) + |
| 1125 | y * td->xsize * s->nb_channels + td->xsize * (o + 0) + x; | 1124 | y * td->xsize * s->nb_channels + td->xsize * (o + 0) + x; |
| @@ -1137,9 +1136,9 @@ static int dwa_uncompress(const EXRContext *s, const uint8_t *src, int compresse · 11 unmodified lines | |||
| 1137 | 1136 | ||
| 1138 | convert(yb[idx], ub[idx], vb[idx], &bo[xx], &go[xx], &ro[xx]); | 1137 | convert(yb[idx], ub[idx], vb[idx], &bo[xx], &go[xx], &ro[xx]); |
| 1139 | 1138 | ||
| 1140 | bo[xx] = to_linear(bo[xx], scale); | 1139 | bo[xx] = to_linear(bo[xx], 1.f); |
| 1141 | go[xx] = to_linear(go[xx], scale); | 1140 | go[xx] = to_linear(go[xx], 1.f); |
| 1142 | ro[xx] = to_linear(ro[xx], scale); | 1141 | ro[xx] = to_linear(ro[xx], 1.f); |
| 1143 | } | 1142 | } |
| 1144 | 1143 | ||
| 1145 | bo += td->xsize * s->nb_channels; | 1144 | bo += td->xsize * s->nb_channels; |