Skip to content

Commit

Permalink
Fixed licenses (#147)
Browse files Browse the repository at this point in the history
* Made sure of using Axis Communications AB
* Change Apache URL to use https
* Add license header to all READMEs
  • Loading branch information
Mar Balibrea Rull authored Jun 1, 2023
1 parent 764a82d commit e16dbd4
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 21 deletions.
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
https://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

Expand Down Expand Up @@ -192,7 +192,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0
https://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
*Copyright (C) 2022, Axis Communications AB, Lund, Sweden. All Rights Reserved.*

# ACAP Computer Vision SDK examples

[![CI](https://github.com/AxisCommunications/acap-computer-vision-sdk-examples/actions/workflows/ci.yml/badge.svg)](https://github.com/AxisCommunications/acap-computer-vision-sdk-examples/actions/workflows/ci.yml)
Expand Down
4 changes: 2 additions & 2 deletions object-detector-cpp/app/src/object_detect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand Down Expand Up @@ -237,4 +237,4 @@ int main(int argc, char *argv[]) {
} catch (const exception &e) {
cerr << "Exception: " << e.what() << endl;
}
}
}
2 changes: 1 addition & 1 deletion object-detector-cpp/app/src/serving_client.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
2 changes: 1 addition & 1 deletion object-detector-python/app/detector.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
2 changes: 1 addition & 1 deletion opencv-image-capture-cpp/app/src/capture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
4 changes: 2 additions & 2 deletions opencv-qr-decoder-python/app/qr.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand Down Expand Up @@ -39,7 +39,7 @@
got_frame, frame = cap.read()

# Preprocessing
# RGB to BGR to accommodate the QR detectors input signature
# RGB to BGR to accommodate the QR detectors input signature
frame = frame[:, :, ::-1]

# Find and decode any QR codes present in image
Expand Down
2 changes: 1 addition & 1 deletion parameter-api-cpp/app/apis/keyvaluestore.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
16 changes: 8 additions & 8 deletions parameter-api-cpp/app/src/parameter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand Down Expand Up @@ -40,13 +40,13 @@ class Parameter {
// and its corresponding value as a pair
vector<pair<string, string>> GetValues(
const vector<string>& keys) {

vector<pair<string,string>> values;
ClientContext context;
Request request;
Response response;

auto stream = stub_->GetValues(&context);
auto stream = stub_->GetValues(&context);
for (const auto& key : keys) {
// Key we are sending to the server.
request.set_key(key);
Expand All @@ -63,10 +63,10 @@ class Parameter {

// Act upon its status.
if (!status.ok()) {
throw std::runtime_error("Can not access gRPC channel: " + status.error_message());
throw std::runtime_error("Can not access gRPC channel: " + status.error_message());
}
return values;
}
}
private:
std::unique_ptr<KeyValueStore::Stub> stub_;
};
Expand All @@ -89,7 +89,7 @@ string read_text(const char* path)

// main function
int main(int argc, char* argv[])
{
{
// camera keys
vector<string> keys = {
"root.Brand.Brand",
Expand All @@ -102,7 +102,7 @@ int main(int argc, char* argv[])

try {
// Create channel
shared_ptr<Channel> channel;
shared_ptr<Channel> channel;
if (argc > 1) {
// gRPC secure connection
string root_cert = read_text(argv[1]);
Expand Down Expand Up @@ -131,4 +131,4 @@ int main(int argc, char* argv[])
{
cerr << "Error has occurred: " << e.what() << endl;
}
}
}
2 changes: 1 addition & 1 deletion parameter-api-python/app/apis/keyvaluestore.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
2 changes: 1 addition & 1 deletion parameter-api-python/app/src/parameter.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
2 changes: 1 addition & 1 deletion pose-estimator-with-flask/app/detector_with_flask.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
Expand Down

0 comments on commit e16dbd4

Please sign in to comment.