← Back to branch summary

~ubuntu-branches/ubuntu/vivid/darkroom/vivid-proposed

« back to all changes in this revision

Viewing changes to src/JobThumbnail.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Thomas
  • Date: 2010-12-28 11:58:00 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20101228115800-rrr39r7wc8q7sdu1
Tags: 1.5.0~svn1073625-0ubuntu1
* New upstream snapshot, fixes FTBFS with newer GCC versions
* Add kubuntu_01_linker_fix.diff to fix linking with ld's --as-needed flag
* Bump Standards-Version to 3.9.1
* Switch to source format 3.0 (quilt)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/JobThumbnail.cpp
72
72
  raw.imgdata.params.filtering_mode = LIBRAW_FILTERING_AUTOMATIC;
73
73
  int ret = raw.open_file(QFile::encodeName(d->rawImageInfo->fileInfo().absoluteFilePath()));
74
74
  if(ret != LIBRAW_SUCCESS) {
75
 
    MessagesModel::instance()->tellError(i18n("Thumbnail"), i18n("Fail to open: %1.", d->rawImageInfo->fileInfo().absoluteFilePath()));
 
75
    MessagesModel::instance()->tellError(i18n("Thumbnail"), i18n("Failed to open %1.", d->rawImageInfo->fileInfo().absoluteFilePath()));
76
76
    return;
77
77
  }
78
78
  raw.unpack_thumb();
112
112
  }
113
113
  if(img.isNull()) {
114
114
    d->rawImageInfo->setStatus( RawImageInfo::ERROR );
115
 
    MessagesModel::instance()->tellError(i18n("Thumbnail"), i18n("Fail to extract thumbnail from: %1.", d->rawImageInfo->fileInfo().absoluteFilePath()));
 
115
    MessagesModel::instance()->tellError(i18n("Thumbnail"), i18n("Failed to extract thumbnail from %1.", d->rawImageInfo->fileInfo().absoluteFilePath()));
116
116
    return;
117
117
  }
118
118