Fixed a non-resolved conflict that was committed by accident.

Signed-off-by: Vinicius Dias de Oliveira Gardelli <gardelli123@gmail.com>
Changed Image::operator() into corresponding getters/setters and implemented edge-mirroring for correlation with off-image data.

Signed-off-by: Vinicius Dias de Oliveira Gardelli <gardelli123@gmail.com>