Skip to content

Few small fixes

Bitbucket Importer requested to merge bitbucket/merged-pr-228 into branch/unified

Created originally on Bitbucket by jpaana (Jarno Paananen)

Was already merged in Bitbucket before import, marked as merged by the import user

Source changeset not longer availableat the time of import. Commit listwill look empty

Here are a few small fixes to be able to compile ML under OSX I have used for a while. Split to four commits:

  • When compiling documentation, OSX version of sed gives error about command U, which comes from the fact that one line in mkdoc-cam.py doesn't have -e option when using -i option. GNU sed doesn't seem to require it, but doesn't hurt either
  • Currently the camera count in dcraw-bridge.c is wrong (should be 34 instead of 33) and converting dual iso file from EOS M fails to find camera model even though it's listed. As a hardcoded count is error prone, I added simple sentinel entries to the end of the lists and check for them instead of a fixed count for loop.
  • bolt_rec module doesn't compile due to duplicate MODULE_STRING entries. I don't know if the module works at the moment, haven't used it for a while, but doesn't hurt to fix I guess.
  • OSX version of "date" command doesn't support -d option to give a date which is used to convert hg timestamp to UTC. When trying to fix it, I though it's a bit overkill to fork two new processes for that trivial task so I implemented them directly in python instead.

This is my first pull request so all comments are welcome :)

// Jarno

Merge request reports