| Chunk |
|---|
| Conflicting content |
|---|
rasterWidth = pRasterWidth;
rasterHeight = pRasterHeight;
alphaScale = MathLib.atan(3.0 * (pFlame.getForegroundOpacity() - 1)) / 1.25 + 1;
<<<<<<< HEAD
oversample = pFlame.getSpatialOversampling();
=======
>>>>>>> 4cde78b0c47be0e844abfad1d55658924b79fe1d
initFilter();
}
|
| Solution content |
|---|
rasterWidth = pRasterWidth;
rasterHeight = pRasterHeight;
alphaScale = MathLib.atan(3.0 * (pFlame.getForegroundOpacity() - 1)) / 1.25 + 1;
oversample = pFlame.getSpatialOversampling();
initFilter();
}
|
| File |
|---|
| GammaCorrectionFilter.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |