Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Robot/robot
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2.0.0
Choose a base ref
...
head repository: Robot/robot
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Oct 11, 2016

  1. Update LICENSE

    @dkrutsko
    dkrutsko authored Oct 11, 2016
    Copy the full SHA
    6037029 View commit details

Commits on Feb 25, 2017

  1. Fix misleading indentation in Image.cc (#40)

    @czipperz @dkrutsko
    czipperz authored and dkrutsko committed Feb 25, 2017
    Copy the full SHA
    e5d5358 View commit details

Commits on Aug 13, 2017

  1. Updated README file (#86, fixes #84)

    @dkrutsko
    dkrutsko authored Aug 13, 2017
    Copy the full SHA
    a19be18 View commit details
Showing with 20 additions and 28 deletions.
  1. +13 −13 LICENSE
  2. +5 −14 README.md
  3. +2 −1 Source/Image.cc
26 changes: 13 additions & 13 deletions LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Copyright (C) 2010-2016 Robot Developers

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.

Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:

1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
19 changes: 5 additions & 14 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -4,27 +4,18 @@
</a>
</p>

<h1 align="center">
Native System Automation
</h1>
<h1 align="center">Native System Automation</h1>

<p align="center">
<a target="_blank" href="http://getrobot.net">
<img src="https://img.shields.io/badge/built_with-ROBOT-C86414.svg?style=flat-square" alt="Built with Robot" />
<img src="https://img.shields.io/badge/Built_with-ROBOT-C86414.svg?style=flat-square" alt="Built with Robot" />
</a>

<img src="https://img.shields.io/badge/version-2.0.0-C86414.svg?style=flat-square" alt="Version 2.0.0" />

<a target="_blank" href="https://gitter.im/robot/robot">
<img src="https://img.shields.io/badge/chat_on-GITTER-C86414.svg?style=flat-square" alt="Chat on Gitter" />
</a>

<img src="https://img.shields.io/badge/Version-2.0.0-C86414.svg?style=flat-square" alt="Version 2.0.0" />
<a target="_blank" href="http://getrobot.net/api/global.html">
<img src="https://img.shields.io/badge/docs-API-C86414.svg?style=flat-square" alt="Docs API" />
<img src="https://img.shields.io/badge/Docs-API-C86414.svg?style=flat-square" alt="Docs API" />
</a>

<a target="_blank" href="https://opensource.org/licenses/Zlib">
<img src="https://img.shields.io/badge/license-ZLIB-C86414.svg?style=flat-square" alt="ZLIB Licensed" />
<img src="https://img.shields.io/badge/License-ZLIB-C86414.svg?style=flat-square" alt="ZLIB Licensed" />
</a>
</p>

3 changes: 2 additions & 1 deletion Source/Image.cc
View file
Original file line number Diff line number Diff line change
@@ -199,7 +199,8 @@ bool Image::Fill (const Color& color)
// Loop data and fill contents
uint32 argb = color.GetARGB();
for (uint32 i = 0; i < mLength; ++i)
mData[i] = argb; return true;
mData[i] = argb;
return true;
}

////////////////////////////////////////////////////////////////////////////////