# ImageMagick can handle NEF files, but it does it by calling dcraw as a delegate.
# The delegate support is rather broken and causes very odd stuff to happen when
# more than one thread does this at the same time. Thus, we simply do it ourselves.
- if ($filename =~ /\.nef$/i) {
+ if ($filename =~ /\.(nef|cr2)$/i) {
# this would suffice if ImageMagick gets to fix their handling
# $physical_fname = "NEF:$physical_fname";
}
# Any NEF files => default to processing
- my $ref = $dbh->selectrow_hashref("SELECT * FROM images WHERE vhost=? $where AND LOWER(filename) LIKE '%.nef' LIMIT 1",
+ my $ref = $dbh->selectrow_hashref("SELECT * FROM images WHERE vhost=? $where AND ( LOWER(filename) LIKE '%.nef' OR LOWER(filename) LIKE '%.cr2' ) LIMIT 1",
undef, $r->get_server_name)
and $defsettings{'xres'} = $defsettings{'yres'} = undef;