~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to src/VBox/Main/src-client/DisplayImpl.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-07-04 13:02:31 UTC
  • mfrom: (3.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20110704130231-l843es6wqhx614n7
Tags: 4.0.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Add the Modaliases control field manually for maximum backportability.

Show diffs side-by-side

added added

removed removed

Lines of Context:
990
990
     * will still work as it should. */
991
991
    if (!(maFramebuffers[0].fDisabled))
992
992
    {
 
993
        x1 = (int32_t)maFramebuffers[0].xOrigin;
 
994
        y1 = (int32_t)maFramebuffers[0].yOrigin;
993
995
        x2 = mpDrv->IConnector.cx + (int32_t)maFramebuffers[0].xOrigin;
994
996
        y2 = mpDrv->IConnector.cy + (int32_t)maFramebuffers[0].yOrigin;
995
997
    }